Skip to content
This repository was archived by the owner on Apr 25, 2023. It is now read-only.

Commit bca4a4b

Browse files
authored
Merge pull request #1289 from alejandroEsc/ae/certman/2
chore: use cert-mananager.io/v1 group/version
2 parents 671e57e + 4fb70ca commit bca4a4b

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ metadata:
1515
{{- end }}
1616
annotations:
1717
{{- if .Values.certManager.enabled }}
18-
{{ .Values.certManager.apiGroup }}/inject-ca-from: {{ printf "%s/%s%s" .Release.Namespace .Release.Name "-root-certificate" | quote }}
18+
cert-manager.io/inject-ca-from: {{ printf "%s/%s%s" .Release.Namespace .Release.Name "-root-certificate" | quote }}
1919
{{- end }}
2020
webhooks:
2121
- name: federatedtypeconfigs.core.kubefed.io
@@ -152,15 +152,15 @@ stringData:
152152
tls.key: {{ $cert.Key | quote }}
153153
{{- else }}
154154
---
155-
apiVersion: {{ .Values.certManager.apiGroup }}/{{ .Values.certManager.apiVersion }}
155+
apiVersion: cert-manager.io/v1
156156
kind: Issuer
157157
metadata:
158158
name: {{ .Release.Name }}-ca-issuer
159159
spec:
160160
selfSigned: {}
161161
---
162162
# Generate a CA Certificate used to sign certificates for the webhook
163-
apiVersion: {{ .Values.certManager.apiGroup }}/{{ .Values.certManager.apiVersion }}
163+
apiVersion: cert-manager.io/v1
164164
kind: Certificate
165165
metadata:
166166
name: {{ .Release.Name}}-root-certificate
@@ -173,7 +173,7 @@ spec:
173173
isCA: true
174174
---
175175
# Create an Issuer that uses the above generated CA certificate to issue certs
176-
apiVersion: {{ .Values.certManager.apiGroup }}/{{ .Values.certManager.apiVersion }}
176+
apiVersion: cert-manager.io/v1
177177
kind: Issuer
178178
metadata:
179179
name: {{ .Release.Name }}-issuer
@@ -182,7 +182,7 @@ spec:
182182
secretName: {{ .Release.Name}}-root-ca
183183
---
184184
# Finally, generate a serving certificate for the webhook to use
185-
apiVersion: {{ .Values.certManager.apiGroup }}/{{ .Values.certManager.apiVersion }}
185+
apiVersion: cert-manager.io/v1
186186
kind: Certificate
187187
metadata:
188188
name: {{ .Release.Name }}-certificate

charts/kubefed/values.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,6 @@ controllermanager:
6262

6363
certManager:
6464
enabled: false
65-
apiGroup: certmanager.k8s.io
66-
apiVersion: v1alpha1
67-
6865

6966
## Configuration global values for all charts
7067
##

0 commit comments

Comments
 (0)