Merge pull request #1490 from mesosphere/mh/fix-mwc-cacert

Fix mutatingwebhookconfiguration CA cert when cert-manager is enabled
kubernetes-retired · Feb 9, 2022 · 90dd17b · 90dd17b
2 parents c26fab5 + 252d136
commit 90dd17b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/charts/kubefed/Chart.yaml b/charts/kubefed/Chart.yaml
@@ -1,11 +1,11 @@
 apiVersion: v2
 description: KubeFed helm chart
 name: kubefed
-version: 0.0.4
+version: 0.0.5
 kubeVersion: ">= 1.16.0-0"
 dependencies:
 - name: controllermanager
-  version: 0.0.4
+  version: 0.0.5
   repository: "https://localhost/" # Required but unused.
   condition: controllermanager.enabled
 
diff --git a/charts/kubefed/charts/controllermanager/Chart.yaml b/charts/kubefed/charts/controllermanager/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v2
 appVersion: "0.8.1"
 description: A Helm chart for KubeFed Controller Manager
 name: controllermanager
-version: 0.0.4
+version: 0.0.5
diff --git a/charts/kubefed/charts/controllermanager/templates/webhook.yaml b/charts/kubefed/charts/controllermanager/templates/webhook.yaml
@@ -123,6 +123,10 @@ metadata:
 {{- else }}
   name: mutation.core.kubefed.io
 {{- end }}
+  annotations:
+  {{- if .Values.certManager.enabled }}
+    cert-manager.io/inject-ca-from: {{ printf "%s/%s%s" .Release.Namespace .Release.Name "-root-certificate" | quote }}
+  {{- end }}
 webhooks:
 - name: kubefedconfigs.core.kubefed.io
   admissionReviewVersions: