From 4fb70ca05ca2bc49e0ecca73325acd7d1b4b437d Mon Sep 17 00:00:00 2001
From: alejandroEsc <jaescobar.cell@gmail.com>
Date: Thu, 1 Oct 2020 10:58:46 -0700
Subject: [PATCH] chore: use cert-mananager.io/v1 group/version

---
 .../charts/controllermanager/templates/webhook.yaml    | 10 +++++-----
 charts/kubefed/values.yaml                             |  3 ---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/charts/kubefed/charts/controllermanager/templates/webhook.yaml b/charts/kubefed/charts/controllermanager/templates/webhook.yaml
index cfa2def7c9..64b5862d2c 100644
--- a/charts/kubefed/charts/controllermanager/templates/webhook.yaml
+++ b/charts/kubefed/charts/controllermanager/templates/webhook.yaml
@@ -15,7 +15,7 @@ metadata:
 {{- end }}
   annotations:
   {{- if .Values.certManager.enabled }}
-    {{ .Values.certManager.apiGroup }}/inject-ca-from: {{ printf "%s/%s%s" .Release.Namespace .Release.Name "-root-certificate" | quote }}
+    cert-manager.io/inject-ca-from: {{ printf "%s/%s%s" .Release.Namespace .Release.Name "-root-certificate" | quote }}
   {{- end }}
 webhooks:
 - name: federatedtypeconfigs.core.kubefed.io
@@ -152,7 +152,7 @@ stringData:
   tls.key: {{ $cert.Key | quote }}
 {{- else }}
 ---
-apiVersion: {{ .Values.certManager.apiGroup }}/{{ .Values.certManager.apiVersion }}
+apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
   name: {{ .Release.Name }}-ca-issuer
@@ -160,7 +160,7 @@ spec:
   selfSigned: {}
 ---
 # Generate a CA Certificate used to sign certificates for the webhook
-apiVersion: {{ .Values.certManager.apiGroup }}/{{ .Values.certManager.apiVersion }}
+apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
   name: {{ .Release.Name}}-root-certificate
@@ -173,7 +173,7 @@ spec:
   isCA: true
 ---
 # Create an Issuer that uses the above generated CA certificate to issue certs
-apiVersion: {{ .Values.certManager.apiGroup }}/{{ .Values.certManager.apiVersion }}
+apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
   name: {{ .Release.Name }}-issuer
@@ -182,7 +182,7 @@ spec:
     secretName: {{ .Release.Name}}-root-ca
 ---
 # Finally, generate a serving certificate for the webhook to use
-apiVersion: {{ .Values.certManager.apiGroup }}/{{ .Values.certManager.apiVersion }}
+apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
   name: {{ .Release.Name }}-certificate
diff --git a/charts/kubefed/values.yaml b/charts/kubefed/values.yaml
index d0375b746b..0f542f5e30 100644
--- a/charts/kubefed/values.yaml
+++ b/charts/kubefed/values.yaml
@@ -62,9 +62,6 @@ controllermanager:
 
   certManager:
     enabled: false
-    apiGroup: certmanager.k8s.io
-    apiVersion: v1alpha1
-
 
 ## Configuration global values for all charts
 ##