Skip to content

Update helm chart to better match available values and add the ability to add annotations #423

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
k8s-ci-robot merged 8 commits into from
Mar 1, 2020
Merged

Update helm chart to better match available values and add the ability to add annotations #423

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d37cdac
krmichel Nov 30, 2019
92f474f
krmichel Nov 30, 2019
5419c88
krmichel Nov 30, 2019
a6dd875
krmichel Dec 5, 2019
6fcc402
krmichel Dec 22, 2019
a368e50
Merge remote-tracking branch 'upstream/master'
krmichel Dec 22, 2019
0c243cd
Merge remote-tracking branch 'upstream/master'
krmichel Feb 26, 2020
5a73c52
krmichel Feb 26, 2020
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
Prev Previous commit
Next Next commit 
Keep 'beta.kubernetes.io/os: linux' as a hard-coded node selector
  • Loading branch information
@krmichel
krmichel committed Dec 5, 2019
commit a6dd87506a2c661ea770e078ace351ccb92b5613
5 changes: 3 additions & 2 deletions aws-ebs-csi-driver/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,11 @@ spec:
{{ toYaml .Values.podAnnotations | indent 8 }}
{{- end }}
spec:
{{- with .Values.nodeSelector }}
nodeSelector:
beta.kubernetes.io/os: linux
{{- with .Values.nodeSelector }}
{{ toYaml . | indent 8 }}
{{- end }}
{{- end }}
serviceAccountName: ebs-csi-controller-sa
priorityClassName: system-cluster-critical
{{- with .Values.affinity }}
Expand Down
3 changes: 1 addition & 2 deletions aws-ebs-csi-driver/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@ resources: {}
# cpu: 100m
# memory: 128Mi

nodeSelector:
beta.kubernetes.io/os: linux
nodeSelector: {}

tolerations: []

Expand Down