Skip to content

Commit

Permalink
Small fixes in CSI node (#46)
Browse files Browse the repository at this point in the history
Signed-off-by: v.oleynikov <[email protected]>
  • Loading branch information
duckhawk authored Nov 3, 2023
1 parent be2e578 commit 2877b00
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 20 deletions.
2 changes: 1 addition & 1 deletion charts/helm_lib/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
type: library
name: deckhouse_lib_helm
version: 1.12.0
version: 1.13.0
description: "Helm utils template definitions for Deckhouse modules."
9 changes: 0 additions & 9 deletions charts/helm_lib/templates/_csi_node.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ memory: 25Mi
{{- $serviceAccount := $config.serviceAccount | default "" }}
{{- $additionalNodeEnvs := $config.additionalNodeEnvs }}
{{- $additionalNodeArgs := $config.additionalNodeArgs }}
{{- $additionalInitContainerEnvs := $config.additionalInitContainerEnvs }}
{{- $additionalInitContainerParts := $config.additionalInitContainerParts }}
{{- $additionalNodeVolumes := $config.additionalNodeVolumes }}
{{- $additionalNodeVolumeMounts := $config.additionalNodeVolumeMounts }}
{{- $initContainerCommand := $config.initContainerCommand }}
Expand Down Expand Up @@ -161,19 +159,12 @@ spec:
initContainers:
- command:
{{- $initContainerCommand | toYaml | nindent 8 }}
{{- if $additionalInitContainerEnvs }}
env:
{{- $additionalInitContainerEnvs | toYaml | nindent 8 }}
{{- end }}
image: {{ $initContainerImage }}
imagePullPolicy: IfNotPresent
name: csi-node-init-container
resources:
requests:
{{- include "helm_lib_module_ephemeral_storage_logs_with_extra" 10 | nindent 12 }}
{{- if $additionalInitContainerParts }}
{{- $additionalInitContainerParts | toYaml | nindent 8 }}
{{- end }}
{{- end }}
serviceAccount: {{ $serviceAccount | quote }}
serviceAccountName: {{ $serviceAccount | quote }}
Expand Down
10 changes: 0 additions & 10 deletions tests/tests/helm_lib_csi_node_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,3 @@ tests:
path: "spec.template.spec.initContainers[0].command"
value: |
- initContainerCommand
- equal:
path: "spec.template.spec.initContainers[0].additionalPart0"
value: additionalPart0

- equal:
path: "spec.template.spec.initContainers[0].env[0]"
value:
name: testEnv
value: testValue

0 comments on commit 2877b00

Please sign in to comment.