mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-03-09 11:47:47 +03:00
MetalLB: keep nodeSelector in one place (#7931)
Signed-off-by: Maciej Wereski <m.wereski@partner.samsung.com>
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user