Browse Source

fix(helm-chart): remove caBundle and set name/namespace (#1001)

Do not set caBundle to avoid issues with GitOps tools.
Jeroen Op 't Eynde 4 years ago
parent
commit
c04350d0d0

+ 3 - 1
Makefile

@@ -153,7 +153,7 @@ generate: ## Generate code and crds
   		cp "$$i.bkp" "$$i" && \
   		rm "$$i.bkp"; \
   	done
-	@yq e '.spec.conversion.strategy = "Webhook" | .spec.conversion.webhook.conversionReviewVersions = ["v1"] | .spec.conversion.webhook.clientConfig.caBundle = "Cg==" | .spec.conversion.webhook.clientConfig.service.name = "kubernetes" | .spec.conversion.webhook.clientConfig.service.namespace = "default" |	.spec.conversion.webhook.clientConfig.service.path = "/convert"' $(CRD_DIR)/bases/*  > $(BUNDLE_DIR)/bundle.yaml
+	@yq e '.spec.conversion.strategy = "Webhook" | .spec.conversion.webhook.conversionReviewVersions = ["v1"] | .spec.conversion.webhook.clientConfig.service.name = "kubernetes" | .spec.conversion.webhook.clientConfig.service.namespace = "default" |	.spec.conversion.webhook.clientConfig.service.path = "/convert"' $(CRD_DIR)/bases/*  > $(BUNDLE_DIR)/bundle.yaml
 	@$(OK) Finished generating deepcopy and crds
 
 # ====================================================================================
@@ -206,6 +206,8 @@ helm.generate:
 		cat "$$i.bkp" >> "$$i" && \
 		echo "{{- end }}" >> "$$i" && \
 		rm "$$i.bkp" && \
+		sed -i 's/name: kubernetes/name: {{ include "external-secrets.fullname" . }}-webhook/g' "$$i" && \
+		sed -i 's/namespace: default/namespace: {{ .Release.Namespace | quote }}/g' "$$i" && \
 		mv "$$i" "$${i%.yml}.yaml"; \
 	done
 	@$(OK) Finished generating helm chart files

+ 0 - 5
deploy/charts/external-secrets/templates/validatingwebhook.yaml

@@ -18,8 +18,6 @@ webhooks:
       namespace: {{ .Release.Namespace | quote }}
       name: {{ include "external-secrets.fullname" . }}-webhook
       path: /validate-external-secrets-io-v1beta1-secretstore
-    # will be set by controller
-    caBundle: Cg==
   admissionReviewVersions: ["v1", "v1beta1"]
   sideEffects: None
   timeoutSeconds: 5
@@ -36,7 +34,6 @@ webhooks:
       namespace: {{ .Release.Namespace | quote }}
       name: {{ include "external-secrets.fullname" . }}-webhook
       path: /validate-external-secrets-io-v1beta1-clustersecretstore
-    caBundle: Cg== # will be set by controller
   admissionReviewVersions: ["v1", "v1beta1"]
   sideEffects: None
   timeoutSeconds: 5
@@ -60,8 +57,6 @@ webhooks:
       namespace: {{ .Release.Namespace | quote }}
       name: {{ include "external-secrets.fullname" . }}-webhook
       path: /validate-external-secrets-io-v1beta1-externalsecret
-    # will be set by controller
-    caBundle: Cg==
   admissionReviewVersions: ["v1", "v1beta1"]
   sideEffects: None
   timeoutSeconds: 5

+ 0 - 4
deploy/crds/bundle.yaml

@@ -320,7 +320,6 @@ spec:
       conversionReviewVersions:
         - v1
       clientConfig:
-        caBundle: Cg==
         service:
           name: kubernetes
           namespace: default
@@ -2365,7 +2364,6 @@ spec:
       conversionReviewVersions:
         - v1
       clientConfig:
-        caBundle: Cg==
         service:
           name: kubernetes
           namespace: default
@@ -2874,7 +2872,6 @@ spec:
       conversionReviewVersions:
         - v1
       clientConfig:
-        caBundle: Cg==
         service:
           name: kubernetes
           namespace: default
@@ -4922,7 +4919,6 @@ spec:
       conversionReviewVersions:
         - v1
       clientConfig:
-        caBundle: Cg==
         service:
           name: kubernetes
           namespace: default