From 77b577ebbb0a1898a5032c70b178e017d883838d Mon Sep 17 00:00:00 2001
From: TheBlackMini <13702361+TheBlackMini@users.noreply.github.com>
Date: Thu, 24 Oct 2024 16:19:27 +1000
Subject: [PATCH] Add ability to annotate deployments & pods for autocert &
 step-issuer

---
 autocert/templates/autocert.yaml      | 8 ++++++++
 autocert/values.yaml                  | 6 ++++++
 step-issuer/templates/deployment.yaml | 8 ++++++++
 step-issuer/values.yaml               | 6 ++++++
 4 files changed, 28 insertions(+)

diff --git a/autocert/templates/autocert.yaml b/autocert/templates/autocert.yaml
index bbe969d..88fa128 100644
--- a/autocert/templates/autocert.yaml
+++ b/autocert/templates/autocert.yaml
@@ -4,6 +4,10 @@ metadata:
   name: {{ include "autocert.fullname" . }}
   labels: 
     {{- include "autocert.labels" . | nindent 4 }}
+  {{- if .Values.annotations }}
+  annotations:
+    {{- toYaml .Values.annotations | nindent 4 }}
+  {{- end }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
@@ -15,6 +19,10 @@ spec:
       labels:
         app.kubernetes.io/name: {{ include "autocert.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
+      {{- if .Values.podAnnotations }}
+      annotations:
+        {{- toYaml .Values.podAnnotations | nindent 8}}
+      {{- end }}
     spec:
       {{- if and .Release.IsInstall (index .Values "step-certificates" "enabled") }}
       initContainers:
diff --git a/autocert/values.yaml b/autocert/values.yaml
index 04887e0..fadac80 100644
--- a/autocert/values.yaml
+++ b/autocert/values.yaml
@@ -19,6 +19,12 @@ service:
 podSecurityContext: {}
   # fsGroup: 2000
 
+# Deployment Annotations
+annotations: {}
+
+# Annotations to be added to deployment pods
+podAnnotations: {}
+
 # autocert contains the configuration for autocert.
 autocert:
   # image contains the docker image for step-certificates.
diff --git a/step-issuer/templates/deployment.yaml b/step-issuer/templates/deployment.yaml
index 2f9cf08..1bc6f8e 100644
--- a/step-issuer/templates/deployment.yaml
+++ b/step-issuer/templates/deployment.yaml
@@ -6,6 +6,10 @@ metadata:
   labels:
     control-plane: {{ .Values.service.controlPlane }}
     {{- include "step-issuer.labels" . | nindent 4 }}
+  {{- if .Values.annotations }}
+  annotations:
+    {{- toYaml .Values.annotations | nindent 4 }}
+  {{- end }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
@@ -17,6 +21,10 @@ spec:
       labels:
         control-plane: {{ .Values.service.controlPlane }}
         {{- include "step-issuer.labels" . | nindent 8 }}
+      {{- if .Values.podAnnotations }}
+      annotations:
+        {{- toYaml .Values.podAnnotations | nindent 8}}
+      {{- end }}
     spec:
       {{- if $.Values.imagePullSecrets }}
       imagePullSecrets:
diff --git a/step-issuer/values.yaml b/step-issuer/values.yaml
index bb1b5ad..67d0ee7 100644
--- a/step-issuer/values.yaml
+++ b/step-issuer/values.yaml
@@ -27,6 +27,12 @@ imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
 
+# Deployment Annotations
+annotations: {}
+
+# Annotations to be added to deployment pods
+podAnnotations: {}
+
 deployment:
   # Configure arguments to pass to the step issuer
   args: