[internal] Changes in CSI initContainers

Signed-off-by: v.oleynikov <[email protected]> Unpacked lib helm Signed-off-by: v.oleynikov <[email protected]>
deckhouse · Nov 18, 2024 · 4381b04 · 4381b04
1 parent ec73e20
commit 4381b04
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 20 deletions.
diff --git a/charts/deckhouse_lib_helm-1.31.0.tgz b/charts/deckhouse_lib_helm-1.31.0.tgz
diff --git a/charts/deckhouse_lib_helm-1.35.3.tgz b/charts/deckhouse_lib_helm-1.35.3.tgz
diff --git 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,8 @@
   name: tmp-dir
 
 {{- if .Values.csiNfs.v3support }}
-- name: run-rpcbind-sock
-  mountPath: /run/rpcbind.sock
+- name: run
+  mountPath: /run
 {{- end }}
 
 {{- end }}
@@ -87,9 +84,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) }}
@@ -129,6 +124,12 @@
 {{- define "csi_additional_node_volume_mounts" }}
 - name: run-rpcbind-sock
   mountPath: /run/rpcbind.sock
+
+{{- if .Values.csiNfs.v3support }}
+- name: run
+  mountPath: /run
+{{- end }}
+
 {{- end }}
 
 {{- $csiNodeConfig := dict }}
@@ -142,9 +143,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) }}