Skip to content
Snippets Groups Projects
Unverified Commit e1967b07 authored by Maciej Wereski's avatar Maciej Wereski Committed by GitHub
Browse files

MetalLB: keep nodeSelector in one place (#7931)

parent 507091ec
No related branches found
No related tags found
No related merge requests found
...@@ -6,8 +6,10 @@ metallb_port: "7472" ...@@ -6,8 +6,10 @@ metallb_port: "7472"
metallb_memberlist_port: "7946" metallb_memberlist_port: "7946"
metallb_peers: [] metallb_peers: []
metallb_speaker_enabled: true metallb_speaker_enabled: true
metallb_speaker_nodeselector: {} metallb_speaker_nodeselector:
metallb_controller_nodeselector: {} kubernetes.io/os: "linux"
metallb_controller_nodeselector:
kubernetes.io/os: "linux"
metallb_speaker_tolerations: metallb_speaker_tolerations:
- effect: NoSchedule - effect: NoSchedule
key: node-role.kubernetes.io/master key: node-role.kubernetes.io/master
......
...@@ -398,14 +398,12 @@ spec: ...@@ -398,14 +398,12 @@ spec:
- ALL - ALL
readOnlyRootFilesystem: true readOnlyRootFilesystem: true
hostNetwork: true hostNetwork: true
nodeSelector:
kubernetes.io/os: linux
serviceAccountName: speaker
terminationGracePeriodSeconds: 2
{% if metallb_speaker_nodeselector %} {% if metallb_speaker_nodeselector %}
nodeSelector: nodeSelector:
{{ metallb_speaker_nodeselector | to_nice_yaml | indent(width=8) }} {{ metallb_speaker_nodeselector | to_nice_yaml | indent(width=8) }}
{%- endif %} {%- endif %}
serviceAccountName: speaker
terminationGracePeriodSeconds: 2
{% if metallb_speaker_tolerations %} {% if metallb_speaker_tolerations %}
tolerations: tolerations:
{{ metallb_speaker_tolerations | to_nice_yaml(indent=2) | indent(width=8) }} {{ metallb_speaker_tolerations | to_nice_yaml(indent=2) | indent(width=8) }}
...@@ -435,10 +433,6 @@ spec: ...@@ -435,10 +433,6 @@ spec:
app: metallb app: metallb
component: controller component: controller
spec: spec:
{% if metallb_controller_nodeselector %}
nodeSelector:
{{ metallb_controller_nodeselector | to_nice_yaml | indent(width=8) }}
{%- endif %}
{% if metallb_controller_tolerations %} {% if metallb_controller_tolerations %}
tolerations: tolerations:
{{ metallb_controller_tolerations | to_nice_yaml(indent=2) | indent(width=8) }} {{ metallb_controller_tolerations | to_nice_yaml(indent=2) | indent(width=8) }}
...@@ -463,8 +457,10 @@ spec: ...@@ -463,8 +457,10 @@ spec:
drop: drop:
- all - all
readOnlyRootFilesystem: true readOnlyRootFilesystem: true
{% if metallb_controller_nodeselector %}
nodeSelector: nodeSelector:
kubernetes.io/os: linux {{ metallb_controller_nodeselector | to_nice_yaml | indent(width=8) }}
{%- endif %}
securityContext: securityContext:
runAsNonRoot: true runAsNonRoot: true
runAsUser: 65534 runAsUser: 65534
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment