Skip to content

Commit

Permalink
fix: remove duplicate tolerations keys for metallb chart (#1249)
Browse files Browse the repository at this point in the history
Signed-off-by: Pawel Rozlach <[email protected]>
  • Loading branch information
vespian authored Nov 24, 2021
1 parent dbe3564 commit de0218e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
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

0 comments on commit de0218e

Please sign in to comment.