From 88f0924a07f3d90dffcf7d479db0fc91dc35a5aa Mon Sep 17 00:00:00 2001
From: nicolas-geniteau <30727364+nicolas-geniteau@users.noreply.github.com>
Date: Mon, 20 Sep 2021 15:10:41 +0200
Subject: [PATCH] Fix CRD for helm chart (#58)

---
 Makefile                                           | 14 +++++++-------
 ...enerator.mittwald.de_v1alpha1_basicauth_cr.yaml |  0
 ...nerator.mittwald.de_v1alpha1_sshkeypair_cr.yaml |  0
 ...rator.mittwald.de_v1alpha1_stringsecret_cr.yaml |  0
 deploy/helm-chart/crds                             |  1 -
 deploy/helm-chart/kubernetes-secret-generator/crds |  1 +
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename deploy/{crds => cr-examples}/secretgenerator.mittwald.de_v1alpha1_basicauth_cr.yaml (100%)
 rename deploy/{crds => cr-examples}/secretgenerator.mittwald.de_v1alpha1_sshkeypair_cr.yaml (100%)
 rename deploy/{crds => cr-examples}/secretgenerator.mittwald.de_v1alpha1_stringsecret_cr.yaml (100%)
 delete mode 120000 deploy/helm-chart/crds
 create mode 120000 deploy/helm-chart/kubernetes-secret-generator/crds

diff --git a/Makefile b/Makefile
index 1570e336..e1fd1137 100644
--- 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)
\ No newline at end of file
+	@exit $(.SHELLSTATUS)
diff --git a/deploy/crds/secretgenerator.mittwald.de_v1alpha1_basicauth_cr.yaml b/deploy/cr-examples/secretgenerator.mittwald.de_v1alpha1_basicauth_cr.yaml
similarity index 100%
rename from deploy/crds/secretgenerator.mittwald.de_v1alpha1_basicauth_cr.yaml
rename to deploy/cr-examples/secretgenerator.mittwald.de_v1alpha1_basicauth_cr.yaml
diff --git a/deploy/crds/secretgenerator.mittwald.de_v1alpha1_sshkeypair_cr.yaml b/deploy/cr-examples/secretgenerator.mittwald.de_v1alpha1_sshkeypair_cr.yaml
similarity index 100%
rename from deploy/crds/secretgenerator.mittwald.de_v1alpha1_sshkeypair_cr.yaml
rename to deploy/cr-examples/secretgenerator.mittwald.de_v1alpha1_sshkeypair_cr.yaml
diff --git a/deploy/crds/secretgenerator.mittwald.de_v1alpha1_stringsecret_cr.yaml b/deploy/cr-examples/secretgenerator.mittwald.de_v1alpha1_stringsecret_cr.yaml
similarity index 100%
rename from deploy/crds/secretgenerator.mittwald.de_v1alpha1_stringsecret_cr.yaml
rename to deploy/cr-examples/secretgenerator.mittwald.de_v1alpha1_stringsecret_cr.yaml
diff --git a/deploy/helm-chart/crds b/deploy/helm-chart/crds
deleted file mode 120000
index 9461d466..00000000
--- a/deploy/helm-chart/crds
+++ /dev/null
@@ -1 +0,0 @@
-../crds
\ No newline at end of file
diff --git a/deploy/helm-chart/kubernetes-secret-generator/crds b/deploy/helm-chart/kubernetes-secret-generator/crds
new file mode 120000
index 00000000..87cfb907
--- /dev/null
+++ b/deploy/helm-chart/kubernetes-secret-generator/crds
@@ -0,0 +1 @@
+../../crds/
\ No newline at end of file