Allow for ConfigMaps to be annotated (#272)

Without an annotation, spinnaker will rename the configmap.

---------

Signed-off-by: Faisal Memon <[email protected]>
Co-authored-by: kfox1111 <[email protected]>

charts/spire/charts/spire-server/README.md

@@ -30,6 +30,8 @@ A Helm chart to install the SPIRE server.
 | ca_subject.organization | string | `"Example"` |  |
 | clusterDomain | string | `"cluster.local"` |  |
 | clusterName | string | `"example-cluster"` |  |
+| configMap.annotations | object | `{}` | Annotations to add to the SPIRE Server ConfigMap |
+| controllerManager.configMap.annotations | object | `{}` | Annotations to add to the Controller Manager ConfigMap |
 | controllerManager.enabled | bool | `false` |  |
 | controllerManager.identities.dnsNameTemplates | list | `[]` |  |
 | controllerManager.identities.enabled | bool | `true` |  |

charts/spire/charts/spire-server/templates/configmap.yaml

@@ -104,6 +104,10 @@ kind: ConfigMap
 metadata:
   name: {{ include "spire-server.fullname" . }}
   namespace: {{ include "spire-server.namespace" . }}
+  {{- with .Values.configMap.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 data:
   server.conf: |
     {{- include "spire-server.yaml-config" . | fromYaml | toPrettyJson | nindent 4 }}

charts/spire/charts/spire-server/templates/controller-manager-configmap.yaml

@@ -4,6 +4,10 @@ kind: ConfigMap
 metadata:
   name: {{ include "spire-controller-manager.fullname" . }}
   namespace: {{ include "spire-server.namespace" . }}
+  {{- with .Values.controllerManager.configMap.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 data:
   controller-manager-config.yaml: |
     apiVersion: spire.spiffe.io/v1alpha1

charts/spire/charts/spire-server/values.yaml

@@ -46,6 +46,10 @@ service:
   port: 8081
   annotations: {}
 
+configMap:
+  # -- Annotations to add to the SPIRE Server ConfigMap
+  annotations: {}
+
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little
@@ -186,6 +190,10 @@ controllerManager:
     port: 443
     annotations: {}
 
+  configMap:
+    # -- Annotations to add to the Controller Manager ConfigMap
+    annotations: {}
+
   ignoreNamespaces:
     - kube-system
     - kube-public