diff --git a/charts/deckhouse_lib_helm-1.31.0.tgz b/charts/deckhouse_lib_helm-1.31.0.tgz deleted file mode 100644 index 669d8b0..0000000 Binary files a/charts/deckhouse_lib_helm-1.31.0.tgz and /dev/null differ diff --git a/charts/deckhouse_lib_helm-1.35.3.tgz b/charts/deckhouse_lib_helm-1.35.3.tgz new file mode 100644 index 0000000..55e8725 Binary files /dev/null and b/charts/deckhouse_lib_helm-1.35.3.tgz differ diff --git a/templates/csi/controller.yaml b/templates/csi/controller.yaml index 4c2eb4a..8bd0ce4 100644 --- a/templates/csi/controller.yaml +++ b/templates/csi/controller.yaml @@ -1,18 +1,18 @@ ### ### common ### -{{- define "csi_init_container_command" }} -- "/wait-rpcbind" -{{- end }} -{{- define "csi_init_container_volume_mounts" }} -- name: run - mountPath: /run +{{- define "csi_init_containers" }} +- name: wait-rpc-bind-init-container + command: + - "/wait-rpcbind" + imagePullPolicy: IfNotPresent + image: {{ include "helm_lib_module_image" (list . "waitRpcbind") }} + volumeMounts: + - name: run + mountPath: /run {{- end }} -{{- $csiInitContainerImage := include "helm_lib_module_image" (list . "waitRpcbind") }} - - ### ### controller ### @@ -47,9 +47,6 @@ emptyDir: {} {{- if .Values.csiNfs.v3support }} -- name: run-rpcbind-sock - hostPath: - path: /run/rpcbind.sock - name: run hostPath: path: /run @@ -65,8 +62,9 @@ name: tmp-dir {{- if .Values.csiNfs.v3support }} -- name: run-rpcbind-sock - mountPath: /run/rpcbind.sock +- name: run + hostPath: + path: /run {{- end }} {{- end }} @@ -87,9 +85,7 @@ {{- $_ := set $csiControllerConfig "additionalControllerVolumeMounts" (include "csi_additional_controller_volume_mounts" . | fromYamlArray) }} {{- if .Values.csiNfs.v3support }} -{{- $_ := set $csiControllerConfig "initContainerImage" $csiInitContainerImage }} -{{- $_ := set $csiControllerConfig "initContainerCommand" (include "csi_init_container_command" . | fromYamlArray) }} -{{- $_ := set $csiControllerConfig "initContainerVolumeMounts" (include "csi_init_container_volume_mounts" . | fromYamlArray) }} +{{- $_ := set $csiControllerConfig "initContainers" (include "csi_init_containers" . | fromYamlArray) }} {{- end }} {{- include "helm_lib_csi_controller_manifests" (list . $csiControllerConfig) }} @@ -142,9 +138,7 @@ {{- if .Values.csiNfs.v3support }} {{- $_ := set $csiNodeConfig "additionalNodeVolumes" (include "csi_additional_node_volume" . | fromYamlArray) }} {{- $_ := set $csiNodeConfig "additionalNodeVolumeMounts" (include "csi_additional_node_volume_mounts" . | fromYamlArray) }} -{{- $_ := set $csiNodeConfig "initContainerImage" $csiInitContainerImage }} -{{- $_ := set $csiNodeConfig "initContainerCommand" (include "csi_init_container_command" . | fromYamlArray) }} -{{- $_ := set $csiNodeConfig "initContainerVolumeMounts" (include "csi_init_container_volume_mounts" . | fromYamlArray) }} +{{- $_ := set $csiNodeConfig "initContainers" (include "csi_init_containers" . | fromYamlArray) }} {{- end }} {{- include "helm_lib_csi_node_manifests" (list . $csiNodeConfig) }}