Add Helm compatibility for --reuse-values upgrades #1789
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| {{- define "node-windows" }} | ||
| {{- if (.Values.node).enableWindows }} | ||
| --- | ||
| kind: DaemonSet | ||
| apiVersion: apps/v1 | ||
| metadata: | ||
|
|
@@ -12,54 +13,73 @@ spec: | |
| matchLabels: | ||
| app: {{ .NodeName }} | ||
| {{- include "aws-ebs-csi-driver.selectorLabels" . | nindent 6 }} | ||
| {{- with (.Values.node).updateStrategy }} | ||
| updateStrategy: | ||
| {{- toYaml . | nindent 4 }} | ||
| {{- else }} | ||
| updateStrategy: | ||
| type: RollingUpdate | ||
| rollingUpdate: | ||
| maxUnavailable: "10%" | ||
| {{- end }} | ||
| template: | ||
| metadata: | ||
| labels: | ||
| app: {{ .NodeName }} | ||
| {{- include "aws-ebs-csi-driver.labels" . | nindent 8 }} | ||
| {{- with (.Values.node).podLabels }} | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
| {{- with (.Values.node).podAnnotations }} | ||
| annotations: | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
| spec: | ||
| {{- with (.Values.node).affinity }} | ||
| affinity: | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- else }} | ||
| affinity: | ||
| nodeAffinity: | ||
| requiredDuringSchedulingIgnoredDuringExecution: | ||
| nodeSelectorTerms: | ||
| - matchExpressions: | ||
| - key: eks.amazonaws.com/compute-type | ||
| operator: NotIn | ||
| values: | ||
| - fargate | ||
| {{- end }} | ||
| nodeSelector: | ||
| kubernetes.io/os: windows | ||
| {{- with (.Values.node).nodeSelector }} | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
| serviceAccountName: {{ default "ebs-csi-node-sa" ((.Values.node).serviceAccount).name }} | ||
| priorityClassName: {{ default "system-node-critical" (.Values.node).priorityClassName }} | ||
| tolerations: | ||
| {{- if default true (.Values.node).tolerateAllTaints }} | ||
| - operator: Exists | ||
| {{- else }} | ||
| {{- with (.Values.node).tolerations }} | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
| - key: "ebs.csi.aws.com/agent-not-ready" | ||
| operator: "Exists" | ||
| {{- end }} | ||
| hostNetwork: {{ default "false" (.Values.node).hostNetwork }} | ||
| containers: | ||
| - name: ebs-plugin | ||
| image: {{ printf "%s%s:%s" (default "" (.Values.image).containerRegistry) (default "public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver" (.Values.image).repository) (toString (default (printf "v%s" .Chart.AppVersion) (.Values.image).tag)) }} | ||
| imagePullPolicy: {{ default "IfNotPresent" (.Values.image).pullPolicy }} | ||
| args: | ||
| - node | ||
| - --endpoint=$(CSI_ENDPOINT) | ||
| {{- with (.Values.node).volumeAttachLimit }} | ||
| - --volume-attach-limit={{ . }} | ||
| {{- end }} | ||
| - --logging-format={{ default "text" (.Values.node).loggingFormat }} | ||
| - --v={{ default "2" (.Values.node).logLevel }} | ||
| {{- if (.Values.node).otelTracing }} | ||
| - --enable-otel-tracing=true | ||
| {{- end}} | ||
| env: | ||
|
|
@@ -69,18 +89,22 @@ spec: | |
| valueFrom: | ||
| fieldRef: | ||
| fieldPath: spec.nodeName | ||
| {{- if (.Values.proxy).http_proxy }} | ||
| {{- include "aws-ebs-csi-driver.http-proxy" . | nindent 12 }} | ||
| {{- end }} | ||
| {{- with (.Values.node).otelTracing }} | ||
| - name: OTEL_SERVICE_NAME | ||
| value: {{ .otelServiceName }} | ||
| - name: OTEL_EXPORTER_OTLP_ENDPOINT | ||
| value: {{ .otelExporterEndpoint }} | ||
| {{- end }} | ||
| {{- with (.Values.node).env }} | ||
| {{- . | toYaml | nindent 12 }} | ||
| {{- end }} | ||
| {{- with (.Values.node).envFrom }} | ||
| envFrom: | ||
| {{- . | toYaml | nindent 12 }} | ||
| {{- end }} | ||
| volumeMounts: | ||
| - name: kubelet-dir | ||
| mountPath: C:\var\lib\kubelet | ||
|
|
@@ -105,9 +129,16 @@ spec: | |
| timeoutSeconds: 3 | ||
| periodSeconds: 10 | ||
| failureThreshold: 5 | ||
| {{- with (.Values.node).resources }} | ||
| resources: | ||
| {{- toYaml . | nindent 12 }} | ||
| {{- else }} | ||
| resources: | ||
| requests: | ||
| cpu: 10m | ||
| memory: 40Mi | ||
| limits: | ||
| memory: 256Mi | ||
| {{- end }} | ||
| securityContext: | ||
| windowsOptions: | ||
|
|
@@ -117,23 +148,27 @@ spec: | |
| exec: | ||
| command: ["/bin/aws-ebs-csi-driver", "pre-stop-hook"] | ||
| - name: node-driver-registrar | ||
| image: {{ printf "%s%s:%s" (default "" (.Values.image).containerRegistry) (default "public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar" (((.Values.sidecars).nodeDriverRegistrar).image).repository) (default "v2.9.0-eks-1-28-6" (((.Values.sidecars).nodeDriverRegistrar).image).tag) }} | ||
|
There was a problem hiding this comment. I'm against putting default sidecar tags in the chart that we would have to risk changing every release. There was a problem hiding this comment. It seems like this default value is not relevant to the chart tester CI job failing: Additional DaemonSets feature #1722 There was a problem hiding this comment. I dislike it, but all default values (including tags) must be duplicated into the chart for this support to work. Otherwise, users upgrading with |
||
| imagePullPolicy: {{ default (default "IfNotPresent" (.Values.image).pullPolicy) (((.Values.sidecars).nodeDriverRegistrar).image).pullPolicy }} | ||
| args: | ||
| - --csi-address=$(ADDRESS) | ||
| - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH) | ||
| - --v={{ default "2" ((.Values.sidecars).nodeDriverRegistrar).logLevel }} | ||
| env: | ||
| - name: ADDRESS | ||
| value: unix:/csi/csi.sock | ||
| - name: DRIVER_REG_SOCK_PATH | ||
| value: C:\var\lib\kubelet\plugins\ebs.csi.aws.com\csi.sock | ||
| {{- if (.Values.proxy).http_proxy }} | ||
| {{- include "aws-ebs-csi-driver.http-proxy" . | nindent 12 }} | ||
| {{- end }} | ||
| {{- with ((.Values.sidecars).nodeDriverRegistrar).env }} | ||
| {{- . | toYaml | nindent 12 }} | ||
| {{- end }} | ||
| {{- with (.Values.node).envFrom }} | ||
| envFrom: | ||
| {{- . | toYaml | nindent 12 }} | ||
| {{- end }} | ||
| livenessProbe: | ||
| exec: | ||
| command: | ||
|
|
@@ -150,25 +185,46 @@ spec: | |
| mountPath: C:\registration | ||
| - name: probe-dir | ||
| mountPath: C:\var\lib\kubelet\plugins\ebs.csi.aws.com | ||
| {{- with default (.Values.node).resources ((.Values.sidecars).nodeDriverRegistrar).resources }} | ||
| resources: | ||
| {{- toYaml . | nindent 12 }} | ||
| {{- else }} | ||
| resources: | ||
| requests: | ||
| cpu: 10m | ||
| memory: 40Mi | ||
| limits: | ||
| memory: 256Mi | ||
| {{- end }} | ||
| - name: liveness-probe | ||
| image: {{ printf "%s%s:%s" (default "" (.Values.image).containerRegistry) (default "public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe" (((.Values.sidecars).livenessProbe).image).repository) (default "v2.10.0-eks-1-28-6" (((.Values.sidecars).livenessProbe).image).tag) }} | ||
| imagePullPolicy: {{ default (default "IfNotPresent" (.Values.image).pullPolicy) (((.Values.sidecars).livenessProbe).image).pullPolicy }} | ||
| args: | ||
| - --csi-address=unix:/csi/csi.sock | ||
| {{- range ((.Values.sidecars).livenessProbe).additionalArgs }} | ||
| - {{ . }} | ||
| {{- end }} | ||
| {{- with (.Values.node).envFrom }} | ||
| envFrom: | ||
| {{- . | toYaml | nindent 12 }} | ||
| {{- end }} | ||
| volumeMounts: | ||
| - name: plugin-dir | ||
| mountPath: C:\csi | ||
| {{- with default (.Values.node).resources ((.Values.sidecars).livenessProbe).resources }} | ||
| resources: | ||
| {{- toYaml . | nindent 12 }} | ||
| {{- else }} | ||
| resources: | ||
| requests: | ||
| cpu: 10m | ||
| memory: 40Mi | ||
| limits: | ||
| memory: 256Mi | ||
| {{- end }} | ||
| {{- with .Values.imagePullSecrets }} | ||
| imagePullSecrets: | ||
| {{- range . }} | ||
| - name: {{ . }} | ||
| {{- end }} | ||
| {{- end }} | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This
---is just for styling yes?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, it's for separating multiple YAML documents in the same file. It used to be inside
node.yamlandnode-windows.yamlbut I moved it here so it's only rendered if the relevantDaemonSetis enabled, otherwise extra---s will be rendered when theDaemonSetis disabled.