diff --git a/charts/helm_lib/Chart.yaml b/charts/helm_lib/Chart.yaml index 9dc2e1a..9e4db8e 100644 --- a/charts/helm_lib/Chart.yaml +++ b/charts/helm_lib/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 type: library name: deckhouse_lib_helm -version: 1.46.2 +version: 1.47.0 description: "Helm utils template definitions for Deckhouse modules." diff --git a/charts/helm_lib/templates/_csi_controller.tpl b/charts/helm_lib/templates/_csi_controller.tpl index 71375c2..c40eec3 100644 --- a/charts/helm_lib/templates/_csi_controller.tpl +++ b/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 diff --git a/charts/helm_lib/templates/_csi_node.tpl b/charts/helm_lib/templates/_csi_node.tpl index 00c3ef0..eff93a6 100644 --- a/charts/helm_lib/templates/_csi_node.tpl +++ b/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 }}