Added: additional Controller and Node Annotations

Author: mrwesadex-flant

charts/helm_lib/templates/_csi_controller.tpl

@@ -56,6 +56,7 @@ memory: 50Mi
   {{- $attacherWorkers := $config.attacherWorkers | default "10" }}
   {{- $resizerWorkers := $config.resizerWorkers | default "10" }}
   {{- $snapshotterWorkers := $config.snapshotterWorkers | default "10" }}
+  {{- $additionalControllerAnnotations := $config.additionalControllerAnnotations }}
   {{- $additionalControllerEnvs := $config.additionalControllerEnvs }}
   {{- $additionalSyncerEnvs := $config.additionalSyncerEnvs }}
   {{- $additionalControllerArgs := $config.additionalControllerArgs }}
@@ -173,11 +174,11 @@ metadata:
   name: {{ $fullname }}
   namespace: d8-{{ $context.Chart.Name }}
   {{- include "helm_lib_module_labels" (list $context (dict "app" "csi-controller")) | nindent 2 }}
-
-  {{- if eq $context.Chart.Name "csi-nfs" }}
-  annotations:
-    pod-reloader.deckhouse.io/auto: "true"
+  
+  {{- if $additionalControllerAnnotations }}
+  {{- $additionalControllerAnnotations | toYaml | nindent 2 }}
   {{- end }}
+  
 spec:
   replicas: 1
   revisionHistoryLimit: 2

charts/helm_lib/templates/_csi_node.tpl

@@ -30,7 +30,7 @@ memory: 25Mi
   {{- $additionalContainers := $config.additionalContainers }} 
   {{- $initContainers := $config.initContainers }}
   {{- $additionalPullSecrets := $config.additionalPullSecrets }}
-
+  {{- $additionalNodeAnnotations := $config.additionalNodeAnnotations }}
   {{- $kubernetesSemVer := semver $context.Values.global.discovery.kubernetesVersion }}
   {{- $driverRegistrarImageName := join "" (list "csiNodeDriverRegistrar" $kubernetesSemVer.Major $kubernetesSemVer.Minor) }}
   {{- $driverRegistrarImage := include "helm_lib_module_common_image_no_fail" (list $context $driverRegistrarImageName) }}
@@ -77,10 +77,10 @@ metadata:
   namespace: d8-{{ $context.Chart.Name }}
   {{- include "helm_lib_module_labels" (list $context (dict "app" "csi-node")) | nindent 2 }}
 
-  {{- if eq $context.Chart.Name "csi-nfs" }}
-  annotations:
-    pod-reloader.deckhouse.io/auto: "true"
+  {{- if $additionalNodeAnnotations }}
+  {{- $additionalNodeAnnotations | toYaml | nindent 2 }}
   {{- end }}
+
   {{- if hasPrefix "cloud-provider-" $context.Chart.Name }}
   annotations:
     cloud-config-checksum: {{ include (print $context.Template.BasePath "/cloud-controller-manager/secret.yaml") $context | sha256sum }}