Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Dennis Schmalacker 2021-01-11 15:23:43 +01:00
commit 0f2ea42f52
2 changed files with 5 additions and 5 deletions

View File

@ -8,7 +8,7 @@ metadata:
release: {{ .Release.Name }} release: {{ .Release.Name }}
heritage: {{ .Release.Service }} heritage: {{ .Release.Service }}
annotations: annotations:
cert-manager.io/inject-ca-from: "{{ .Release.Namespace }}/{{ include "cert-manager-webhook-hetzner.servingCertificate" . }}" certmanager.k8s.io/inject-ca-from: "{{ .Release.Namespace }}/{{ include "cert-manager-webhook-hetzner.servingCertificate" . }}"
spec: spec:
group: {{ .Values.groupName }} group: {{ .Values.groupName }}
groupPriorityMinimum: 1000 groupPriorityMinimum: 1000

View File

@ -1,7 +1,7 @@
--- ---
# Create a selfsigned Issuer, in order to create a root CA certificate for # Create a selfsigned Issuer, in order to create a root CA certificate for
# signing webhook serving certificates # signing webhook serving certificates
apiVersion: cert-manager.io/v1alpha2 apiVersion: cert-manager.io/v1alpha3
kind: Issuer kind: Issuer
metadata: metadata:
name: {{ include "cert-manager-webhook-hetzner.selfSignedIssuer" . }} name: {{ include "cert-manager-webhook-hetzner.selfSignedIssuer" . }}
@ -17,7 +17,7 @@ spec:
--- ---
# Generate a CA Certificate used to sign certificates for the webhook # Generate a CA Certificate used to sign certificates for the webhook
apiVersion: cert-manager.io/v1alpha2 apiVersion: cert-manager.io/v1alpha3
kind: Certificate kind: Certificate
metadata: metadata:
name: {{ include "cert-manager-webhook-hetzner.rootCACertificate" . }} name: {{ include "cert-manager-webhook-hetzner.rootCACertificate" . }}
@ -38,7 +38,7 @@ spec:
--- ---
# Create an Issuer that uses the above generated CA certificate to issue certs # Create an Issuer that uses the above generated CA certificate to issue certs
apiVersion: cert-manager.io/v1alpha2 apiVersion: cert-manager.io/v1alpha3
kind: Issuer kind: Issuer
metadata: metadata:
name: {{ include "cert-manager-webhook-hetzner.rootCAIssuer" . }} name: {{ include "cert-manager-webhook-hetzner.rootCAIssuer" . }}
@ -55,7 +55,7 @@ spec:
--- ---
# Finally, generate a serving certificate for the webhook to use # Finally, generate a serving certificate for the webhook to use
apiVersion: cert-manager.io/v1alpha2 apiVersion: cert-manager.io/v1alpha3
kind: Certificate kind: Certificate
metadata: metadata:
name: {{ include "cert-manager-webhook-hetzner.servingCertificate" . }} name: {{ include "cert-manager-webhook-hetzner.servingCertificate" . }}