fix makefile to store crds in a separate folder (kubeflow#1368)

* separated out the manifests fix from kubeflow#1365 * Update Makefile Co-authored-by: Andrey Velichkevich <andrey.velichkevich@gmail.com> Co-authored-by: Andrey Velichkevich <andrey.velichkevich@gmail.com>
murphp15 · Aug 17, 2021 · 0637e39 · 0637e39
1 parent 513fad6
commit 0637e39
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -38,7 +38,7 @@ help: ## Display this help.
 ##@ Development
 
 manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
-	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./pkg/apis/..." output:crd:artifacts:config=manifests/base
+	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./pkg/apis/..." output:crd:artifacts:config=manifests/base/crds
 
 generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
 	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./pkg/apis/..."
@@ -72,17 +72,17 @@ docker-push: ## Push docker image with the manager.
 ##@ Deployment
 
 install: manifests kustomize ## Install CRDs into the K8s cluster specified in ~/.kube/config.
-	$(KUSTOMIZE) build config/crd | kubectl apply -f -
+	$(KUSTOMIZE) build manifests/base/crds | kubectl apply -f -
 
 uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified in ~/.kube/config.
-	$(KUSTOMIZE) build config/crd | kubectl delete -f -
+	$(KUSTOMIZE) build manifests/base/crds | kubectl delete -f -
 
 deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
-	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
-	$(KUSTOMIZE) build config/default | kubectl apply -f -
+	cd manifests/overlays/standalone && $(KUSTOMIZE) edit set image kubeflow/training-operator=${IMG}
+	$(KUSTOMIZE) build manifests/overlays/standalone | kubectl apply -f -
 
 undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config.
-	$(KUSTOMIZE) build config/default | kubectl delete -f -
+	$(KUSTOMIZE) build manifests/overlays/standalone | kubectl delete -f -
 
 
 CONTROLLER_GEN = $(shell pwd)/bin/controller-gen

diff --git a/manifests/base/kubeflow.org_mxjobs.yaml → manifests/base/crds/kubeflow.org_mxjobs.yaml b/manifests/base/kubeflow.org_mxjobs.yaml → manifests/base/crds/kubeflow.org_mxjobs.yaml
diff --git a/manifests/base/kubeflow.org_pytorchjobs.yaml → ...s/base/crds/kubeflow.org_pytorchjobs.yaml b/manifests/base/kubeflow.org_pytorchjobs.yaml → ...s/base/crds/kubeflow.org_pytorchjobs.yaml
diff --git a/manifests/base/kubeflow.org_tfjobs.yaml → manifests/base/crds/kubeflow.org_tfjobs.yaml b/manifests/base/kubeflow.org_tfjobs.yaml → manifests/base/crds/kubeflow.org_tfjobs.yaml
diff --git a/manifests/base/kubeflow.org_xgboostjobs.yaml → ...s/base/crds/kubeflow.org_xgboostjobs.yaml b/manifests/base/kubeflow.org_xgboostjobs.yaml → ...s/base/crds/kubeflow.org_xgboostjobs.yaml
diff --git a/manifests/base/crds/kustomization.yaml b/manifests/base/crds/kustomization.yaml
@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - kubeflow.org_tfjobs.yaml
+  - kubeflow.org_mxjobs.yaml
+  - kubeflow.org_pytorchjobs.yaml
+  - kubeflow.org_xgboostjobs.yaml
diff --git a/manifests/base/kustomization.yaml b/manifests/base/kustomization.yaml
@@ -1,11 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: kubeflow
 resources:
-  - kubeflow.org_tfjobs.yaml
-  - kubeflow.org_mxjobs.yaml
-  - kubeflow.org_pytorchjobs.yaml
-  - kubeflow.org_xgboostjobs.yaml
+  - ./crds
   - cluster-role-binding.yaml
   - cluster-role.yaml
   - service-account.yaml