From 9201d5de5bf457454c012b0a3bf27fc803f41345 Mon Sep 17 00:00:00 2001 From: Jeff Wenzbauer Date: Mon, 9 Aug 2021 15:28:06 -0600 Subject: [PATCH 1/3] Add use of .Values.serviceAnnotations in Service Signed-off-by: Jeff Wenzbauer --- deploy/charts/cert-manager/templates/service.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/deploy/charts/cert-manager/templates/service.yaml b/deploy/charts/cert-manager/templates/service.yaml index dd206796e..3ba0efe31 100644 --- a/deploy/charts/cert-manager/templates/service.yaml +++ b/deploy/charts/cert-manager/templates/service.yaml @@ -4,6 +4,10 @@ kind: Service metadata: name: {{ template "cert-manager.fullname" . }} namespace: {{ .Release.Namespace | quote }} +{{- with .Values.serviceAnnotations }} + annotations: +{{ toYaml . | indent 4 }} +{{- end }} labels: app: {{ include "cert-manager.name" . }} app.kubernetes.io/name: {{ include "cert-manager.name" . }} From 01635752eaa80c0399c8bc29e12adc39e93fb13d Mon Sep 17 00:00:00 2001 From: Jeff Wenzbauer Date: Mon, 9 Aug 2021 15:29:35 -0600 Subject: [PATCH 2/3] Add documentation of serviceAnnotations Signed-off-by: Jeff Wenzbauer --- deploy/charts/cert-manager/values.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/deploy/charts/cert-manager/values.yaml b/deploy/charts/cert-manager/values.yaml index cbd1fc807..7b55db15b 100644 --- a/deploy/charts/cert-manager/values.yaml +++ b/deploy/charts/cert-manager/values.yaml @@ -140,6 +140,9 @@ volumeMounts: [] podLabels: {} +# Optional annotations to add to the controller Service +# serviceAnnotations: {} + # Optional additional labels to add to the controller Service # serviceLabels: {} From 71c376c935074410f97240f000199f4394f55dd3 Mon Sep 17 00:00:00 2001 From: jwenz723 Date: Mon, 9 Aug 2021 16:26:03 -0600 Subject: [PATCH 3/3] Add webhook service annotations: Signed-off-by: Jeff Wenzbauer --- deploy/charts/cert-manager/templates/webhook-service.yaml | 4 ++++ deploy/charts/cert-manager/values.yaml | 3 +++ 2 files changed, 7 insertions(+) diff --git a/deploy/charts/cert-manager/templates/webhook-service.yaml b/deploy/charts/cert-manager/templates/webhook-service.yaml index 5fc17de6b..8de171cbc 100644 --- a/deploy/charts/cert-manager/templates/webhook-service.yaml +++ b/deploy/charts/cert-manager/templates/webhook-service.yaml @@ -3,6 +3,10 @@ kind: Service metadata: name: {{ template "webhook.fullname" . }} namespace: {{ .Release.Namespace | quote }} +{{- with .Values.webhook.serviceAnnotations }} + annotations: +{{ toYaml . | indent 4 }} +{{- end }} labels: app: {{ include "webhook.name" . }} app.kubernetes.io/name: {{ include "webhook.name" . }} diff --git a/deploy/charts/cert-manager/values.yaml b/deploy/charts/cert-manager/values.yaml index 7b55db15b..4cefd20dc 100644 --- a/deploy/charts/cert-manager/values.yaml +++ b/deploy/charts/cert-manager/values.yaml @@ -232,6 +232,9 @@ webhook: # Optional additional annotations to add to the webhook Pods # podAnnotations: {} + # Optional additional annotations to add to the webhook Service + # serviceAnnotations: {} + # Optional additional annotations to add to the webhook MutatingWebhookConfiguration # mutatingWebhookConfigurationAnnotations: {}