Fix CRD for helm chart (#58)

mittwald · Sep 20, 2021 · 88f0924 · 88f0924
1 parent 236a893
commit 88f0924
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -9,9 +9,9 @@ install: ## Install all resources (RBAC and Operator)
 	kubectl apply -f deploy/role_binding.yaml  -n ${NAMESPACE}
 	kubectl apply -f deploy/service_account.yaml  -n ${NAMESPACE}
 	@echo ....... Applying CRDs .......
-	kubectl apply -f deploy/helm-chart/crds/secretgenerator.mittwald.de_basicauths_crd.yaml
-	kubectl apply -f deploy/helm-chart/crds/secretgenerator.mittwald.de_sshkeypairs_crd.yaml
-	kubectl apply -f deploy/helm-chart/crds/secretgenerator.mittwald.de_stringsecrets_crd.yaml
+	kubectl apply -f deploy/crds/secretgenerator.mittwald.de_basicauths_crd.yaml
+	kubectl apply -f deploy/crds/secretgenerator.mittwald.de_sshkeypairs_crd.yaml
+	kubectl apply -f deploy/crds/secretgenerator.mittwald.de_stringsecrets_crd.yaml
 	@echo ....... Applying Operator .......
 	kubectl apply -f deploy/operator.yaml -n ${NAMESPACE}
 
@@ -66,11 +66,11 @@ deletekind:
 
 .PHONY: crd
 crd: kind
-	kubectl --context kind-kind-k8s-secret-generator apply -f deploy/helm-chart/crds/secretgenerator.mittwald.de_basicauths_crd.yaml
-	kubectl --context kind-kind-k8s-secret-generator apply -f deploy/helm-chart/crds/secretgenerator.mittwald.de_sshkeypairs_crd.yaml
-	kubectl --context kind-kind-k8s-secret-generator apply -f deploy/helm-chart/crds/secretgenerator.mittwald.de_stringsecrets_crd.yaml
+	kubectl --context kind-kind-k8s-secret-generator apply -f deploy/crds/secretgenerator.mittwald.de_basicauths_crd.yaml
+	kubectl --context kind-kind-k8s-secret-generator apply -f deploy/crds/secretgenerator.mittwald.de_sshkeypairs_crd.yaml
+	kubectl --context kind-kind-k8s-secret-generator apply -f deploy/crds/secretgenerator.mittwald.de_stringsecrets_crd.yaml
 
 .PHONY: build
 build:
 	operator-sdk build --go-build-args "-ldflags -X=version.Version=${SECRET_OPERATOR_VERSION}" ${DOCKER_IMAGE}
-	@exit $(.SHELLSTATUS)
+	@exit $(.SHELLSTATUS)
diff --git a/...or.mittwald.de_v1alpha1_basicauth_cr.yaml → ...or.mittwald.de_v1alpha1_basicauth_cr.yaml b/...or.mittwald.de_v1alpha1_basicauth_cr.yaml → ...or.mittwald.de_v1alpha1_basicauth_cr.yaml
diff --git a/...r.mittwald.de_v1alpha1_sshkeypair_cr.yaml → ...r.mittwald.de_v1alpha1_sshkeypair_cr.yaml b/...r.mittwald.de_v1alpha1_sshkeypair_cr.yaml → ...r.mittwald.de_v1alpha1_sshkeypair_cr.yaml
diff --git a/...mittwald.de_v1alpha1_stringsecret_cr.yaml → ...mittwald.de_v1alpha1_stringsecret_cr.yaml b/...mittwald.de_v1alpha1_stringsecret_cr.yaml → ...mittwald.de_v1alpha1_stringsecret_cr.yaml
diff --git a/deploy/helm-chart/crds b/deploy/helm-chart/crds
diff --git a/deploy/helm-chart/kubernetes-secret-generator/crds b/deploy/helm-chart/kubernetes-secret-generator/crds
@@ -0,0 +1 @@
+../../crds/