From 6270c56deeb366e3272ae0b74f258a501fc183f8 Mon Sep 17 00:00:00 2001 From: Mario Bezerra Date: Wed, 14 Jun 2023 19:20:38 -0300 Subject: [PATCH 1/2] Avoid generating manifests with empty envFrom fields Signed-off-by: Mario Bezerra --- .../templates/controller.yaml | 28 +++++++++---------- charts/aws-ebs-csi-driver/templates/node.yaml | 16 +++++------ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/charts/aws-ebs-csi-driver/templates/controller.yaml b/charts/aws-ebs-csi-driver/templates/controller.yaml index 12fcef5c1a..56c7e8b035 100644 --- a/charts/aws-ebs-csi-driver/templates/controller.yaml +++ b/charts/aws-ebs-csi-driver/templates/controller.yaml @@ -132,10 +132,10 @@ spec: {{- with .Values.controller.env }} {{- . | toYaml | nindent 12 }} {{- end }} + {{- with .Values.controller.envFrom }} envFrom: - {{- with .Values.controller.envFrom }} {{- . | toYaml | nindent 12 }} - {{- end }} + {{- end }} volumeMounts: - name: socket-dir mountPath: /var/lib/csi/sockets/pluginproxy/ @@ -210,10 +210,10 @@ spec: {{- with .Values.sidecars.provisioner.env }} {{- . | toYaml | nindent 12 }} {{- end }} + {{- with .Values.controller.envFrom }} envFrom: - {{- with .Values.controller.envFrom }} {{- . | toYaml | nindent 12 }} - {{- end }} + {{- end }} volumeMounts: - name: socket-dir mountPath: /var/lib/csi/sockets/pluginproxy/ @@ -255,10 +255,10 @@ spec: {{- with .Values.sidecars.attacher.env }} {{- . | toYaml | nindent 12 }} {{- end }} + {{- with .Values.controller.envFrom }} envFrom: - {{- with .Values.controller.envFrom }} {{- . | toYaml | nindent 12 }} - {{- end }} + {{- end }} volumeMounts: - name: socket-dir mountPath: /var/lib/csi/sockets/pluginproxy/ @@ -292,10 +292,10 @@ spec: {{- with .Values.sidecars.snapshotter.env }} {{- . | toYaml | nindent 12 }} {{- end }} + {{- with .Values.controller.envFrom }} envFrom: - {{- with .Values.controller.envFrom }} {{- . | toYaml | nindent 12 }} - {{- end }} + {{- end }} volumeMounts: - name: socket-dir mountPath: /var/lib/csi/sockets/pluginproxy/ @@ -339,10 +339,10 @@ spec: {{- with .Values.sidecars.volumemodifier.env }} {{- . | toYaml | nindent 12 }} {{- end }} + {{- with .Values.controller.envFrom }} envFrom: - {{- with .Values.controller.envFrom }} {{- . | toYaml | nindent 12 }} - {{- end }} + {{- end }} volumeMounts: - name: socket-dir mountPath: /var/lib/csi/sockets/pluginproxy/ @@ -386,10 +386,10 @@ spec: {{- with .Values.sidecars.resizer.env }} {{- . | toYaml | nindent 12 }} {{- end }} + {{- with .Values.controller.envFrom }} envFrom: - {{- with .Values.controller.envFrom }} {{- . | toYaml | nindent 12 }} - {{- end }} + {{- end }} volumeMounts: - name: socket-dir mountPath: /var/lib/csi/sockets/pluginproxy/ @@ -409,10 +409,10 @@ spec: {{- range .Values.sidecars.livenessProbe.additionalArgs }} - {{ . }} {{- end }} + {{- with .Values.controller.envFrom }} envFrom: - {{- with .Values.controller.envFrom }} {{- . | toYaml | nindent 12 }} - {{- end }} + {{- end }} volumeMounts: - name: socket-dir mountPath: /csi diff --git a/charts/aws-ebs-csi-driver/templates/node.yaml b/charts/aws-ebs-csi-driver/templates/node.yaml index b080be9808..8684870f16 100644 --- a/charts/aws-ebs-csi-driver/templates/node.yaml +++ b/charts/aws-ebs-csi-driver/templates/node.yaml @@ -77,10 +77,10 @@ spec: {{- with .Values.node.env }} {{- . | toYaml | nindent 12 }} {{- end }} + {{- with .Values.controller.envFrom }} envFrom: - {{- with .Values.controller.envFrom }} {{- . | toYaml | nindent 12 }} - {{- end }} + {{- end }} volumeMounts: - name: kubelet-dir mountPath: {{ .Values.node.kubeletPath }} @@ -130,10 +130,10 @@ spec: {{- range .Values.sidecars.nodeDriverRegistrar.additionalArgs }} - {{ . }} {{- end }} + {{- with .Values.controller.envFrom }} envFrom: - {{- with .Values.controller.envFrom }} {{- . | toYaml | nindent 12 }} - {{- end }} + {{- end }} livenessProbe: exec: command: @@ -163,13 +163,13 @@ spec: imagePullPolicy: {{ default .Values.image.pullPolicy .Values.sidecars.livenessProbe.image.pullPolicy }} args: - --csi-address=/csi/csi.sock - envFrom: - {{- with .Values.controller.envFrom }} - {{- . | toYaml | nindent 12 }} - {{- end }} {{- range .Values.sidecars.livenessProbe.additionalArgs }} - {{ . }} {{- end }} + {{- with .Values.controller.envFrom }} + envFrom: + {{- . | toYaml | nindent 12 }} + {{- end }} volumeMounts: - name: plugin-dir mountPath: /csi From 3a67e4ba744fc341aeeb0619246cc3901e13204f Mon Sep 17 00:00:00 2001 From: Mario Bezerra Date: Wed, 14 Jun 2023 19:24:02 -0300 Subject: [PATCH 2/2] Generate manifests from Helm chart Signed-off-by: Mario Bezerra --- deploy/kubernetes/base/controller.yaml | 6 ------ deploy/kubernetes/base/node.yaml | 3 --- 2 files changed, 9 deletions(-) diff --git a/deploy/kubernetes/base/controller.yaml b/deploy/kubernetes/base/controller.yaml index 1830c1f80a..27eb376566 100644 --- a/deploy/kubernetes/base/controller.yaml +++ b/deploy/kubernetes/base/controller.yaml @@ -94,7 +94,6 @@ spec: name: aws-meta key: endpoint optional: true - envFrom: volumeMounts: - name: socket-dir mountPath: /var/lib/csi/sockets/pluginproxy/ @@ -140,7 +139,6 @@ spec: env: - name: ADDRESS value: /var/lib/csi/sockets/pluginproxy/csi.sock - envFrom: volumeMounts: - name: socket-dir mountPath: /var/lib/csi/sockets/pluginproxy/ @@ -163,7 +161,6 @@ spec: env: - name: ADDRESS value: /var/lib/csi/sockets/pluginproxy/csi.sock - envFrom: volumeMounts: - name: socket-dir mountPath: /var/lib/csi/sockets/pluginproxy/ @@ -186,7 +183,6 @@ spec: env: - name: ADDRESS value: /var/lib/csi/sockets/pluginproxy/csi.sock - envFrom: volumeMounts: - name: socket-dir mountPath: /var/lib/csi/sockets/pluginproxy/ @@ -210,7 +206,6 @@ spec: env: - name: ADDRESS value: /var/lib/csi/sockets/pluginproxy/csi.sock - envFrom: volumeMounts: - name: socket-dir mountPath: /var/lib/csi/sockets/pluginproxy/ @@ -228,7 +223,6 @@ spec: imagePullPolicy: IfNotPresent args: - --csi-address=/csi/csi.sock - envFrom: volumeMounts: - name: socket-dir mountPath: /csi diff --git a/deploy/kubernetes/base/node.yaml b/deploy/kubernetes/base/node.yaml index e03dd36bd0..2af3d4e00c 100644 --- a/deploy/kubernetes/base/node.yaml +++ b/deploy/kubernetes/base/node.yaml @@ -58,7 +58,6 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - envFrom: volumeMounts: - name: kubelet-dir mountPath: /var/lib/kubelet @@ -100,7 +99,6 @@ spec: value: /csi/csi.sock - name: DRIVER_REG_SOCK_PATH value: /var/lib/kubelet/plugins/ebs.csi.aws.com/csi.sock - envFrom: livenessProbe: exec: command: @@ -131,7 +129,6 @@ spec: imagePullPolicy: IfNotPresent args: - --csi-address=/csi/csi.sock - envFrom: volumeMounts: - name: plugin-dir mountPath: /csi