Skip to content

Add podLabels parameter Original work by bueti in PR 416 and Allow timeout to be set Original work by coolstim in PR 435 #454

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

Merged
merged 2 commits into from
Aug 25, 2025
+11 −1
Merged

Add podLabels parameter Original work by bueti in PR 416 and Allow timeout to be set Original work by coolstim in PR 435 #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94da938
Add podLabels parameter
Trickybrain Aug 22, 2025
fd9e97c
Allow the timeout of the CSI driver to be set
Trickybrain Aug 22, 2025
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
5 changes: 4 additions & 1 deletion charts/aws-fsx-csi-driver/templates/controller-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ spec:
labels:
app: fsx-csi-controller
{{- include "aws-fsx-csi-driver.labels" . | nindent 8 }}
{{- if .Values.controller.podLabels }}
{{- toYaml .Values.controller.podLabels | nindent 8 }}
{{- end }}
spec:
{{- if .Values.imagePullSecrets }}
imagePullSecrets:
Expand Down Expand Up @@ -96,7 +99,7 @@ spec:
args:
- --csi-address=$(ADDRESS)
- --v={{ .Values.sidecars.provisioner.logLevel }}
- --timeout=5m
- --timeout={{ .Values.controller.timeout| default "5m" }}
- --extra-create-metadata
- --leader-election=true
env:
Expand Down
3 changes: 3 additions & 0 deletions charts/aws-fsx-csi-driver/templates/node-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ spec:
labels:
app: fsx-csi-node
{{- include "aws-fsx-csi-driver.labels" . | nindent 8 }}
{{- if .Values.node.podLabels }}
{{- toYaml .Values.node.podLabels | nindent 8 }}
{{- end }}
spec:
{{- if .Values.imagePullSecrets }}
imagePullSecrets:
Expand Down
4 changes: 4 additions & 0 deletions charts/aws-fsx-csi-driver/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ controller:
- effect: NoExecute
operator: Exists
tolerationSeconds: 300
# Specify the timeout of all calls to the CSI driver.
timeout: 5m
# securityContext on the controller pod
securityContext:
runAsNonRoot: false
Expand All @@ -126,6 +128,7 @@ controller:
values:
- fargate
- hybrid
podLabels: {}
# topologySpreadConstraints:
# - maxSkew: 1
# topologyKey: topology.kubernetes.io/zone
Expand Down Expand Up @@ -200,6 +203,7 @@ node:
values:
- fargate
- hybrid
podLabels: {}

nameOverride: ""
fullnameOverride: ""
Expand Down