Skip to content

Commit 2877b00

Browse files
authored
Small fixes in CSI node (#46)
Signed-off-by: v.oleynikov <[email protected]>
1 parent be2e578 commit 2877b00

File tree

3 files changed

+1
-20
lines changed

3 files changed

+1
-20
lines changed

charts/helm_lib/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apiVersion: v2
22
type: library
33
name: deckhouse_lib_helm
4-
version: 1.12.0
4+
version: 1.13.0
55
description: "Helm utils template definitions for Deckhouse modules."

charts/helm_lib/templates/_csi_node.tpl

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ memory: 25Mi
1919
{{- $serviceAccount := $config.serviceAccount | default "" }}
2020
{{- $additionalNodeEnvs := $config.additionalNodeEnvs }}
2121
{{- $additionalNodeArgs := $config.additionalNodeArgs }}
22-
{{- $additionalInitContainerEnvs := $config.additionalInitContainerEnvs }}
23-
{{- $additionalInitContainerParts := $config.additionalInitContainerParts }}
2422
{{- $additionalNodeVolumes := $config.additionalNodeVolumes }}
2523
{{- $additionalNodeVolumeMounts := $config.additionalNodeVolumeMounts }}
2624
{{- $initContainerCommand := $config.initContainerCommand }}
@@ -161,19 +159,12 @@ spec:
161159
initContainers:
162160
- command:
163161
{{- $initContainerCommand | toYaml | nindent 8 }}
164-
{{- if $additionalInitContainerEnvs }}
165-
env:
166-
{{- $additionalInitContainerEnvs | toYaml | nindent 8 }}
167-
{{- end }}
168162
image: {{ $initContainerImage }}
169163
imagePullPolicy: IfNotPresent
170164
name: csi-node-init-container
171165
resources:
172166
requests:
173167
{{- include "helm_lib_module_ephemeral_storage_logs_with_extra" 10 | nindent 12 }}
174-
{{- if $additionalInitContainerParts }}
175-
{{- $additionalInitContainerParts | toYaml | nindent 8 }}
176-
{{- end }}
177168
{{- end }}
178169
serviceAccount: {{ $serviceAccount | quote }}
179170
serviceAccountName: {{ $serviceAccount | quote }}

tests/tests/helm_lib_csi_node_test.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,3 @@ tests:
9090
path: "spec.template.spec.initContainers[0].command"
9191
value: |
9292
- initContainerCommand
93-
94-
- equal:
95-
path: "spec.template.spec.initContainers[0].additionalPart0"
96-
value: additionalPart0
97-
98-
- equal:
99-
path: "spec.template.spec.initContainers[0].env[0]"
100-
value:
101-
name: testEnv
102-
value: testValue

0 commit comments

Comments
 (0)