Skip to content
This repository has been archived by the owner on Jun 29, 2022. It is now read-only.

Commit

Permalink
metallb: Remove additional nodeSelector in deployment
Browse files Browse the repository at this point in the history
- Fix the regression added in the previous update by removing the
  extraneous nodeSelector field.

- Move the nodeSelector golang template block down so that in the next
  update cycle we don't encounter this issue.

Signed-off-by: Suraj Deshmukh <suraj@kinvolk.io>
  • Loading branch information
surajssd committed Sep 9, 2020
1 parent 4bb7470 commit 0bff235
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions pkg/components/metallb/manifests.go
Original file line number Diff line number Diff line change
Expand Up @@ -248,12 +248,6 @@ spec:
app: metallb
component: controller
spec:
{{- if .ControllerNodeSelectors }}
nodeSelector:
{{- range $key, $value := .ControllerNodeSelectors }}
{{ $key }}: "{{ $value }}"
{{- end }}
{{- end }}
containers:
- args:
- --port=7472
Expand All @@ -274,13 +268,19 @@ spec:
drop:
- all
readOnlyRootFilesystem: true
# XXX: Lokomotive specific change.
{{- if .ControllerNodeSelectors }}
nodeSelector:
beta.kubernetes.io/os: linux
{{- range $key, $value := .ControllerNodeSelectors }}
{{ $key }}: "{{ $value }}"
{{- end }}
{{- end }}
securityContext:
runAsNonRoot: true
runAsUser: 65534
serviceAccountName: controller
terminationGracePeriodSeconds: 0
# XXX: Lokomotive specific change.
{{- if .ControllerTolerationsJSON }}
tolerations: {{ .ControllerTolerationsJSON }}
{{- end }}
Expand Down

0 comments on commit 0bff235

Please sign in to comment.