change nodeSelector label from deprecated beta.kubernetes.io/os and arch to kubernetes.io prefix (#7138)
This commit is contained in:
parent
387df0ee1f
commit
02213d6e07
3 changed files with 6 additions and 6 deletions
|
@ -339,7 +339,7 @@ spec:
|
||||||
readOnlyRootFilesystem: true
|
readOnlyRootFilesystem: true
|
||||||
hostNetwork: true
|
hostNetwork: true
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
beta.kubernetes.io/os: linux
|
{{ 'beta.' if kube_version is version('v1.18.0', '<') }}kubernetes.io/os: linux
|
||||||
serviceAccountName: speaker
|
serviceAccountName: speaker
|
||||||
terminationGracePeriodSeconds: 2
|
terminationGracePeriodSeconds: 2
|
||||||
tolerations:
|
tolerations:
|
||||||
|
@ -390,7 +390,7 @@ spec:
|
||||||
- all
|
- all
|
||||||
readOnlyRootFilesystem: true
|
readOnlyRootFilesystem: true
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
beta.kubernetes.io/os: linux
|
{{ 'beta.' if kube_version is version('v1.18.0', '<') }}kubernetes.io/os: linux
|
||||||
securityContext:
|
securityContext:
|
||||||
runAsNonRoot: true
|
runAsNonRoot: true
|
||||||
runAsUser: 65534
|
runAsUser: 65534
|
||||||
|
|
|
@ -118,7 +118,7 @@ spec:
|
||||||
periodSeconds: 7
|
periodSeconds: 7
|
||||||
failureThreshold: 5
|
failureThreshold: 5
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
beta.kubernetes.io/os: "linux"
|
{{ 'beta.' if kube_version is version('v1.18.0', '<') }}kubernetes.io/os: "linux"
|
||||||
ovn4nfv-k8s-plugin: ovn-control-plane
|
ovn4nfv-k8s-plugin: ovn-control-plane
|
||||||
volumes:
|
volumes:
|
||||||
- name: host-run-ovs
|
- name: host-run-ovs
|
||||||
|
@ -214,7 +214,7 @@ spec:
|
||||||
cpu: {{ ovn_controller_cpu_limit }}
|
cpu: {{ ovn_controller_cpu_limit }}
|
||||||
memory: {{ ovn_controller_memory_limit }}
|
memory: {{ ovn_controller_memory_limit }}
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
beta.kubernetes.io/os: "linux"
|
{{ 'beta.' if kube_version is version('v1.18.0', '<') }}kubernetes.io/os: "linux"
|
||||||
volumes:
|
volumes:
|
||||||
- name: host-modules
|
- name: host-modules
|
||||||
hostPath:
|
hostPath:
|
||||||
|
|
|
@ -482,7 +482,7 @@ spec:
|
||||||
spec:
|
spec:
|
||||||
hostNetwork: true
|
hostNetwork: true
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
beta.kubernetes.io/arch: amd64
|
{{ 'beta.' if kube_version is version('v1.18.0', '<') }}kubernetes.io/arch: amd64
|
||||||
tolerations:
|
tolerations:
|
||||||
- operator: Exists
|
- operator: Exists
|
||||||
effect: NoSchedule
|
effect: NoSchedule
|
||||||
|
@ -556,7 +556,7 @@ spec:
|
||||||
hostNetwork: true
|
hostNetwork: true
|
||||||
hostPID: true
|
hostPID: true
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
beta.kubernetes.io/arch: amd64
|
{{ 'beta.' if kube_version is version('v1.18.0', '<') }}kubernetes.io/arch: amd64
|
||||||
tolerations:
|
tolerations:
|
||||||
- operator: Exists
|
- operator: Exists
|
||||||
effect: NoSchedule
|
effect: NoSchedule
|
||||||
|
|
Loading…
Reference in a new issue