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.

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

fix: remove duplicate tolerations keys for metallb chart #1249

Merged
merged 1 commit into from
Nov 24, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion stable/metallb/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v1
version: 0.12.2
version: 0.12.3
name: metallb
deprecated: true
appVersion: 0.8.1
Expand Down
9 changes: 4 additions & 5 deletions stable/metallb/templates/speaker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@ spec:
prometheus.io/port: "7472"
{{- end }}
spec:
tolerations:
- key: node-role.kubernetes.io/master
effect: NoSchedule
serviceAccountName: {{ template "metallb.speakerServiceAccountName" . }}
terminationGracePeriodSeconds: 0
hostNetwork: true
Expand Down Expand Up @@ -74,10 +71,12 @@ spec:
{{- with .Values.speaker.nodeSelector }}
{{ toYaml . | indent 8 }}
{{- end }}
{{- with .Values.speaker.tolerations }}
tolerations:
- key: node-role.kubernetes.io/master
effect: NoSchedule
{{- with .Values.speaker.tolerations }}
{{ toYaml . | indent 8 }}
{{- end }}
{{- end }}
{{- with .Values.speaker.affinity }}
affinity:
{{ toYaml . | indent 8 }}
Expand Down