Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add additionalArgs parameter for sidecars #1627

Merged
merged 1 commit into from
Jun 15, 2023
Merged

Add additionalArgs parameter for sidecars #1627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions charts/aws-ebs-csi-driver/templates/controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,9 @@ spec:
{{- end }}
{{- end }}
- --default-fstype={{ .Values.controller.defaultFsType }}
{{- range .Values.sidecars.provisioner.additionalArgs }}
- {{ . }}
{{- end }}
env:
- name: ADDRESS
value: /var/lib/csi/sockets/pluginproxy/csi.sock
Expand Down Expand Up @@ -240,6 +243,9 @@ spec:
- --leader-election-retry-period={{ .Values.sidecars.attacher.leaderElection.retryPeriod }}
{{- end }}
{{- end }}
{{- range .Values.sidecars.attacher.additionalArgs }}
- {{ . }}
{{- end }}
env:
- name: ADDRESS
value: /var/lib/csi/sockets/pluginproxy/csi.sock
Expand Down Expand Up @@ -274,6 +280,9 @@ spec:
{{- if .Values.controller.extraCreateMetadata }}
- --extra-create-metadata
{{- end}}
{{- range .Values.sidecars.snapshotter.additionalArgs }}
- {{ . }}
{{- end }}
env:
- name: ADDRESS
value: /var/lib/csi/sockets/pluginproxy/csi.sock
Expand Down Expand Up @@ -318,6 +327,9 @@ spec:
- --leader-election-retry-period={{ .Values.sidecars.volumemodifier.leaderElection.retryPeriod }}
{{- end }}
{{- end }}
{{- range .Values.sidecars.volumemodifier.additionalArgs }}
- {{ . }}
{{- end }}
env:
- name: ADDRESS
value: /var/lib/csi/sockets/pluginproxy/csi.sock
Expand Down Expand Up @@ -362,6 +374,9 @@ spec:
- --leader-election-retry-period={{ .retryPeriod }}
{{- end }}
{{- end }}
{{- range .Values.sidecars.resizer.additionalArgs }}
- {{ . }}
{{- end }}
env:
- name: ADDRESS
value: /var/lib/csi/sockets/pluginproxy/csi.sock
Expand Down Expand Up @@ -391,6 +406,9 @@ spec:
imagePullPolicy: {{ default .Values.image.pullPolicy .Values.sidecars.livenessProbe.image.pullPolicy }}
args:
- --csi-address=/csi/csi.sock
{{- range .Values.sidecars.livenessProbe.additionalArgs }}
- {{ . }}
{{- end }}
envFrom:
{{- with .Values.controller.envFrom }}
{{- . | toYaml | nindent 12 }}
Expand Down
6 changes: 6 additions & 0 deletions charts/aws-ebs-csi-driver/templates/node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,9 @@ spec:
{{- with .Values.sidecars.nodeDriverRegistrar.env }}
{{- . | toYaml | nindent 12 }}
{{- end }}
{{- range .Values.sidecars.nodeDriverRegistrar.additionalArgs }}
- {{ . }}
{{- end }}
envFrom:
{{- with .Values.controller.envFrom }}
{{- . | toYaml | nindent 12 }}
Expand Down Expand Up @@ -164,6 +167,9 @@ spec:
{{- with .Values.controller.envFrom }}
{{- . | toYaml | nindent 12 }}
{{- end }}
{{- range .Values.sidecars.livenessProbe.additionalArgs }}
- {{ . }}
{{- end }}
volumeMounts:
- name: plugin-dir
mountPath: /csi
Expand Down
7 changes: 7 additions & 0 deletions charts/aws-ebs-csi-driver/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ sidecars:
repository: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner
tag: "v3.5.0-eks-1-27-3"
logLevel: 2
additionalArgs: []
resources: {}
# Tune leader lease election for csi-provisioner.
# Leader election is on by default.
Expand Down Expand Up @@ -52,6 +53,7 @@ sidecars:
# renewDeadline: "10s"
# retryPeriod: "5s"
logLevel: 2
additionalArgs: []
resources: {}
securityContext:
readOnlyRootFilesystem: true
Expand All @@ -65,6 +67,7 @@ sidecars:
repository: public.ecr.aws/eks-distro/kubernetes-csi/external-snapshotter/csi-snapshotter
tag: "v6.2.1-eks-1-27-3"
logLevel: 2
additionalArgs: []
resources: {}
securityContext:
readOnlyRootFilesystem: true
Expand All @@ -74,6 +77,7 @@ sidecars:
pullPolicy: IfNotPresent
repository: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe
tag: "v2.10.0-eks-1-27-3"
additionalArgs: []
resources: {}
securityContext:
readOnlyRootFilesystem: true
Expand All @@ -95,6 +99,7 @@ sidecars:
# renewDeadline: "10s"
# retryPeriod: "5s"
logLevel: 2
additionalArgs: []
resources: {}
securityContext:
readOnlyRootFilesystem: true
Expand All @@ -106,6 +111,7 @@ sidecars:
repository: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar
tag: "v2.8.0-eks-1-27-3"
logLevel: 2
additionalArgs: []
resources: {}
securityContext:
readOnlyRootFilesystem: true
Expand All @@ -125,6 +131,7 @@ sidecars:
# renewDeadline: "10s"
# retryPeriod: "5s"
logLevel: 2
additionalArgs: []
resources: {}
securityContext:
readOnlyRootFilesystem: true
Expand Down