Cleanup old checks for k8s 1.18 (#7192)

This commit is contained in:
Florian Ruynat 2021-01-19 17:43:45 +01:00 committed by GitHub
parent 15dc3868c3
commit f6fbbc17a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 10 deletions

View file

@ -339,7 +339,7 @@ spec:
readOnlyRootFilesystem: true
hostNetwork: true
nodeSelector:
{{ 'beta.' if kube_version is version('v1.18.0', '<') }}kubernetes.io/os: linux
kubernetes.io/os: linux
serviceAccountName: speaker
terminationGracePeriodSeconds: 2
tolerations:
@ -390,7 +390,7 @@ spec:
- all
readOnlyRootFilesystem: true
nodeSelector:
{{ 'beta.' if kube_version is version('v1.18.0', '<') }}kubernetes.io/os: linux
kubernetes.io/os: linux
securityContext:
runAsNonRoot: true
runAsUser: 65534

View file

@ -118,7 +118,7 @@ spec:
periodSeconds: 7
failureThreshold: 5
nodeSelector:
{{ 'beta.' if kube_version is version('v1.18.0', '<') }}kubernetes.io/os: "linux"
kubernetes.io/os: "linux"
ovn4nfv-k8s-plugin: ovn-control-plane
volumes:
- name: host-run-ovs
@ -214,7 +214,7 @@ spec:
cpu: {{ ovn_controller_cpu_limit }}
memory: {{ ovn_controller_memory_limit }}
nodeSelector:
{{ 'beta.' if kube_version is version('v1.18.0', '<') }}kubernetes.io/os: "linux"
kubernetes.io/os: "linux"
volumes:
- name: host-modules
hostPath:

View file

@ -482,7 +482,7 @@ spec:
spec:
hostNetwork: true
nodeSelector:
{{ 'beta.' if kube_version is version('v1.18.0', '<') }}kubernetes.io/arch: amd64
kubernetes.io/arch: amd64
tolerations:
- operator: Exists
effect: NoSchedule
@ -556,7 +556,7 @@ spec:
hostNetwork: true
hostPID: true
nodeSelector:
{{ 'beta.' if kube_version is version('v1.18.0', '<') }}kubernetes.io/arch: amd64
kubernetes.io/arch: amd64
tolerations:
- operator: Exists
effect: NoSchedule

View file

@ -1,5 +1,4 @@
---
kubernetes_user_manifests_path: "{{ ansible_env.HOME }}/kube-manifests"
# nodeselector for kube-proxy ds is beta until 1.18
kube_proxy_nodeselector: "{{ 'kubernetes.io/os' if kube_version is version('v1.18.0', '>=') else 'beta.kubernetes.io/os' }}"
kube_proxy_nodeselector: "kubernetes.io/os"