Merge pull request #1288 from alejandroEsc/ae/cert/versions

chart: cert-manager resources, allow these apiVersions be configurable

Author: k8s-ci-robot

charts/kubefed/charts/controllermanager/templates/webhook.yaml

@@ -15,7 +15,7 @@ metadata:
 {{- end }}
   annotations:
   {{- if .Values.certManager.enabled }}
-    certmanager.k8s.io/inject-ca-from: {{ printf "%s/%s%s" .Release.Namespace .Release.Name "-root-certificate" | quote }}
+    {{ .Values.certManager.apiGroup }}/inject-ca-from: {{ printf "%s/%s%s" .Release.Namespace .Release.Name "-root-certificate" | quote }}
   {{- end }}
 webhooks:
 - name: federatedtypeconfigs.core.kubefed.io
@@ -152,15 +152,15 @@ stringData:
   tls.key: {{ $cert.Key | quote }}
 {{- else }}
 ---
-apiVersion: certmanager.k8s.io/v1alpha1
+apiVersion: {{ .Values.certManager.apiGroup }}/{{ .Values.certManager.apiVersion }}
 kind: Issuer
 metadata:
   name: {{ .Release.Name }}-ca-issuer
 spec:
   selfSigned: {}
 ---
 # Generate a CA Certificate used to sign certificates for the webhook
-apiVersion: certmanager.k8s.io/v1alpha1
+apiVersion: {{ .Values.certManager.apiGroup }}/{{ .Values.certManager.apiVersion }}
 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: certmanager.k8s.io/v1alpha1
+apiVersion: {{ .Values.certManager.apiGroup }}/{{ .Values.certManager.apiVersion }}
 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: certmanager.k8s.io/v1alpha1
+apiVersion: {{ .Values.certManager.apiGroup }}/{{ .Values.certManager.apiVersion }}
 kind: Certificate
 metadata:
   name: {{ .Release.Name }}-certificate

charts/kubefed/values.yaml

@@ -62,6 +62,8 @@ controllermanager:
 
   certManager:
     enabled: false
+    apiGroup: certmanager.k8s.io
+    apiVersion: v1alpha1
 
 
 ## Configuration global values for all charts