From a1214b209dae9dca231cfe2bfd44fafabb50f91b Mon Sep 17 00:00:00 2001
From: Martin Hrabovcin <mhrabovcin.c@mesosphere.com>
Date: Wed, 9 Feb 2022 15:31:25 +0100
Subject: [PATCH 1/2] Fix mutatingwebhookconfiguration CA cert when
 cert-manager is enabled

---
 .../kubefed/charts/controllermanager/templates/webhook.yaml   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/charts/kubefed/charts/controllermanager/templates/webhook.yaml b/charts/kubefed/charts/controllermanager/templates/webhook.yaml
index 23730536e7..ce28e97341 100644
--- 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:

From 252d1369facfde3e8b1da2adefb21d3b145c4ef3 Mon Sep 17 00:00:00 2001
From: Martin Hrabovcin <mhrabovcin.c@mesosphere.com>
Date: Wed, 9 Feb 2022 15:44:11 +0100
Subject: [PATCH 2/2] Bump controllermanager chart version

---
 charts/kubefed/Chart.yaml                          | 4 ++--
 charts/kubefed/charts/controllermanager/Chart.yaml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/charts/kubefed/Chart.yaml b/charts/kubefed/Chart.yaml
index 8154f2aa50..568468c4a8 100644
--- 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
index e74b79d213..8f9ef554ff 100644
--- 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