From c730dd8559e715d3dc4620bbd91d85be521702e3 Mon Sep 17 00:00:00 2001 From: jukie <10012479+Jukie@users.noreply.github.com> Date: Fri, 27 Oct 2023 10:24:21 -0600 Subject: [PATCH 1/2] Fix additionalArgs and allow livenessProbe overrides for node-driver-registrar sidecar --- charts/aws-ebs-csi-driver/templates/_node.tpl | 17 ++++++----------- charts/aws-ebs-csi-driver/values.yaml | 9 +++++++++ 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/charts/aws-ebs-csi-driver/templates/_node.tpl b/charts/aws-ebs-csi-driver/templates/_node.tpl index 4654d7a9ae..eb07d03490 100644 --- a/charts/aws-ebs-csi-driver/templates/_node.tpl +++ b/charts/aws-ebs-csi-driver/templates/_node.tpl @@ -135,6 +135,9 @@ spec: - --csi-address=$(ADDRESS) - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH) - --v={{ .Values.sidecars.nodeDriverRegistrar.logLevel }} + {{- range .Values.sidecars.nodeDriverRegistrar.additionalArgs }} + - {{ . }} + {{- end }} env: - name: ADDRESS value: /csi/csi.sock @@ -146,22 +149,14 @@ spec: {{- with .Values.sidecars.nodeDriverRegistrar.env }} {{- . | toYaml | nindent 12 }} {{- end }} - {{- range .Values.sidecars.nodeDriverRegistrar.additionalArgs }} - - {{ . }} - {{- end }} {{- with .Values.controller.envFrom }} envFrom: {{- . | toYaml | nindent 12 }} {{- end }} + {{- with .Values.sidecars.nodeDriverRegistrar.livenessProbe }} livenessProbe: - exec: - command: - - /csi-node-driver-registrar - - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH) - - --mode=kubelet-registration-probe - initialDelaySeconds: 30 - timeoutSeconds: 15 - periodSeconds: 90 + {{- toYaml . | nindent 12 }} + {{- end }} volumeMounts: - name: plugin-dir mountPath: /csi diff --git a/charts/aws-ebs-csi-driver/values.yaml b/charts/aws-ebs-csi-driver/values.yaml index bc3e89e4a8..b624a0c314 100644 --- a/charts/aws-ebs-csi-driver/values.yaml +++ b/charts/aws-ebs-csi-driver/values.yaml @@ -130,6 +130,15 @@ sidecars: securityContext: readOnlyRootFilesystem: true allowPrivilegeEscalation: false + livenessProbe: + exec: + command: + - /csi-node-driver-registrar + - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH) + - --mode=kubelet-registration-probe + initialDelaySeconds: 30 + timeoutSeconds: 15 + periodSeconds: 90 volumemodifier: env: [] image: From 73cac318622906efdf016c4d4bbe31f10cdeeffc Mon Sep 17 00:00:00 2001 From: jukie <10012479+Jukie@users.noreply.github.com> Date: Fri, 27 Oct 2023 11:10:41 -0600 Subject: [PATCH 2/2] Formatting --- charts/aws-ebs-csi-driver/values.yaml | 8 ++++---- deploy/kubernetes/base/node.yaml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/charts/aws-ebs-csi-driver/values.yaml b/charts/aws-ebs-csi-driver/values.yaml index b624a0c314..080b33fb08 100644 --- a/charts/aws-ebs-csi-driver/values.yaml +++ b/charts/aws-ebs-csi-driver/values.yaml @@ -133,12 +133,12 @@ sidecars: livenessProbe: exec: command: - - /csi-node-driver-registrar - - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH) - - --mode=kubelet-registration-probe + - /csi-node-driver-registrar + - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH) + - --mode=kubelet-registration-probe initialDelaySeconds: 30 - timeoutSeconds: 15 periodSeconds: 90 + timeoutSeconds: 15 volumemodifier: env: [] image: diff --git a/deploy/kubernetes/base/node.yaml b/deploy/kubernetes/base/node.yaml index 572dbd92ea..31d1e71972 100644 --- a/deploy/kubernetes/base/node.yaml +++ b/deploy/kubernetes/base/node.yaml @@ -114,12 +114,12 @@ spec: livenessProbe: exec: command: - - /csi-node-driver-registrar - - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH) - - --mode=kubelet-registration-probe + - /csi-node-driver-registrar + - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH) + - --mode=kubelet-registration-probe initialDelaySeconds: 30 - timeoutSeconds: 15 periodSeconds: 90 + timeoutSeconds: 15 volumeMounts: - name: plugin-dir mountPath: /csi