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

chore: use cert-mananager.io/v1 group/version #1289

Merged
merged 1 commit into from Oct 2, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions charts/kubefed/charts/controllermanager/templates/webhook.yaml
Expand Up @@ -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
Expand Down Expand Up @@ -152,15 +152,15 @@ 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
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
Expand All @@ -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
Expand All @@ -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
Expand Down
3 changes: 0 additions & 3 deletions charts/kubefed/values.yaml
Expand Up @@ -62,9 +62,6 @@ controllermanager:

certManager:
enabled: false
apiGroup: certmanager.k8s.io
apiVersion: v1alpha1


## Configuration global values for all charts
##
Expand Down