Merge pull request #412 from aramase/helm-annotations

helm: add support to set annotations
kubernetes-sigs · Jan 6, 2021 · 3c9123f · 3c9123f
2 parents 2773e4c + 3cf17f2
commit 3c9123f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/manifest_staging/charts/secrets-store-csi-driver/README.md b/manifest_staging/charts/secrets-store-csi-driver/README.md
@@ -42,6 +42,7 @@ The following table lists the configurable parameters of the csi-secrets-store-p
 | `linux.livenessProbe.resources`         | The resource request/limits for the linux liveness-probe container image                                                          | `limits: 100m CPU, 100Mi; requests: 10m CPU, 20Mi`  |
 | `linux.env`                             | Environment variables to be passed for the daemonset on linux nodes                                                               | `[]`                                                |
 | `linux.priorityClassName`               | Indicates the importance of a Pod relative to other Pods.                                                                         | `""`                                                |
+| `linux.annotations`                     | Linux *Daemonset* annotations                                                                                                     | `{}`                                                |
 | `linux.updateStrategy`                  | Configure a custom update strategy for the daemonset on linux nodes                                                               | `RollingUpdate with 1 maxUnavailable`               |
 | `windows.image.repository`              | Windows image repository                                                                                                          | `k8s.gcr.io/csi-secrets-store/driver`               |
 | `windows.image.pullPolicy`              | Windows image pull policy                                                                                                         | `IfNotPresent`                                      |
@@ -62,6 +63,7 @@ The following table lists the configurable parameters of the csi-secrets-store-p
 | `windows.livenessProbe.resources`       | The resource request/limits for the windows liveness-probe container image                                                        | `limits: 200m CPU, 200Mi; requests: 10m CPU, 20Mi`  |
 | `windows.env`                           | Environment variables to be passed for the daemonset on windows nodes                                                             | `[]`                                                |
 | `windows.priorityClassName`             | Indicates the importance of a Pod relative to other Pods.                                                                         | `""`                                                |
+| `windows.annotations`                   | Windows *Daemonset* annotations                                                                                                   | `{}`                                                |
 | `windows.updateStrategy`                | Configure a custom update strategy for the daemonset on windows nodes                                                             | `RollingUpdate with 1 maxUnavailable`               |
 | `logVerbosity`                          | Log level. Uses V logs (klog)                                                                                                     | `0`                                                 |
 | `logFormatJSON`                         | Use JSON logging format                                                                                                           | `false`                                             |

diff --git a/...t_staging/charts/secrets-store-csi-driver/templates/secrets-store-csi-driver-windows.yaml b/...t_staging/charts/secrets-store-csi-driver/templates/secrets-store-csi-driver-windows.yaml
@@ -5,6 +5,10 @@ metadata:
   name: {{ template "sscd.fullname" . }}-windows
   namespace: {{ .Release.Namespace }}
 {{ include "sscd.labels" . | indent 2 }}
+{{- if .Values.windows.annotations }}
+  annotations:
+{{ toYaml .Values.windows.annotations | indent 4 }}
+{{- end }}
 spec:
   selector:
     matchLabels:

diff --git a/manifest_staging/charts/secrets-store-csi-driver/templates/secrets-store-csi-driver.yaml b/manifest_staging/charts/secrets-store-csi-driver/templates/secrets-store-csi-driver.yaml
@@ -5,6 +5,10 @@ metadata:
   name: {{ template "sscd.fullname" . }}
   namespace: {{ .Release.Namespace }}
 {{ include "sscd.labels" . | indent 2 }}
+{{- if .Values.linux.annotations }}
+  annotations:
+{{ toYaml .Values.linux.annotations | indent 4 }}
+{{- end }}
 spec:
   selector:
     matchLabels:

diff --git a/manifest_staging/charts/secrets-store-csi-driver/values.yaml b/manifest_staging/charts/secrets-store-csi-driver/values.yaml
@@ -53,6 +53,7 @@ linux:
   metricsAddr: ":8095"
   env: []
   priorityClassName: ""
+  annotations: {}
 
 windows:
   enabled: false
@@ -109,6 +110,7 @@ windows:
   metricsAddr: ":8095"
   env: []
   priorityClassName: ""
+  annotations: {}
 
 # log level. Uses V logs (klog)
 logVerbosity: 0