MetalLB: keep nodeSelector in one place (#7931)

Signed-off-by: Maciej Wereski <m.wereski@partner.samsung.com>
This commit is contained in:
Maciej Wereski 2021-09-01 18:05:00 +02:00 committed by GitHub
parent 507091ec8b
commit e1967b0700
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 11 deletions

View file

@ -6,8 +6,10 @@ metallb_port: "7472"
metallb_memberlist_port: "7946"
metallb_peers: []
metallb_speaker_enabled: true
metallb_speaker_nodeselector: {}
metallb_controller_nodeselector: {}
metallb_speaker_nodeselector:
kubernetes.io/os: "linux"
metallb_controller_nodeselector:
kubernetes.io/os: "linux"
metallb_speaker_tolerations:
- effect: NoSchedule
key: node-role.kubernetes.io/master

View file

@ -398,14 +398,12 @@ spec:
- ALL
readOnlyRootFilesystem: true
hostNetwork: true
nodeSelector:
kubernetes.io/os: linux
serviceAccountName: speaker
terminationGracePeriodSeconds: 2
{% if metallb_speaker_nodeselector %}
nodeSelector:
{{ metallb_speaker_nodeselector | to_nice_yaml | indent(width=8) }}
{%- endif %}
serviceAccountName: speaker
terminationGracePeriodSeconds: 2
{% if metallb_speaker_tolerations %}
tolerations:
{{ metallb_speaker_tolerations | to_nice_yaml(indent=2) | indent(width=8) }}
@ -435,10 +433,6 @@ spec:
app: metallb
component: controller
spec:
{% if metallb_controller_nodeselector %}
nodeSelector:
{{ metallb_controller_nodeselector | to_nice_yaml | indent(width=8) }}
{%- endif %}
{% if metallb_controller_tolerations %}
tolerations:
{{ metallb_controller_tolerations | to_nice_yaml(indent=2) | indent(width=8) }}
@ -463,8 +457,10 @@ spec:
drop:
- all
readOnlyRootFilesystem: true
{% if metallb_controller_nodeselector %}
nodeSelector:
kubernetes.io/os: linux
{{ metallb_controller_nodeselector | to_nice_yaml | indent(width=8) }}
{%- endif %}
securityContext:
runAsNonRoot: true
runAsUser: 65534