diff --git a/.pipelines/mdnc/azure-cns-cni-1.4.39.1.yaml b/.pipelines/mdnc/azure-cns-cni-1.4.39.1.yaml index 47ae2f3557..749c68a5a6 100644 --- a/.pipelines/mdnc/azure-cns-cni-1.4.39.1.yaml +++ b/.pipelines/mdnc/azure-cns-cni-1.4.39.1.yaml @@ -82,7 +82,7 @@ spec: operator: NotIn values: - virtual-kubelet - - key: beta.kubernetes.io/os + - key: kubernetes.io/os operator: In values: - linux diff --git a/.pipelines/mdnc/azure-cns-cni-1.5.28.yaml b/.pipelines/mdnc/azure-cns-cni-1.5.28.yaml index 3db8a46a3c..e6678c47de 100644 --- a/.pipelines/mdnc/azure-cns-cni-1.5.28.yaml +++ b/.pipelines/mdnc/azure-cns-cni-1.5.28.yaml @@ -82,7 +82,7 @@ spec: operator: NotIn values: - virtual-kubelet - - key: beta.kubernetes.io/os + - key: kubernetes.io/os operator: In values: - linux diff --git a/.pipelines/mdnc/azure-cns-cni-1.5.4.yaml b/.pipelines/mdnc/azure-cns-cni-1.5.4.yaml index f33fbba69d..6a7729974a 100644 --- a/.pipelines/mdnc/azure-cns-cni-1.5.4.yaml +++ b/.pipelines/mdnc/azure-cns-cni-1.5.4.yaml @@ -82,7 +82,7 @@ spec: operator: NotIn values: - virtual-kubelet - - key: beta.kubernetes.io/os + - key: kubernetes.io/os operator: In values: - linux diff --git a/.pipelines/mdnc/azure-cns-cni.yaml b/.pipelines/mdnc/azure-cns-cni.yaml index 469f25c669..f3ecdac9c0 100644 --- a/.pipelines/mdnc/azure-cns-cni.yaml +++ b/.pipelines/mdnc/azure-cns-cni.yaml @@ -82,7 +82,7 @@ spec: operator: NotIn values: - virtual-kubelet - - key: beta.kubernetes.io/os + - key: kubernetes.io/os operator: In values: - linux diff --git a/cns/azure-cns.yaml b/cns/azure-cns.yaml index 260bb775c1..afb5b128a6 100644 --- a/cns/azure-cns.yaml +++ b/cns/azure-cns.yaml @@ -82,7 +82,7 @@ spec: operator: NotIn values: - virtual-kubelet - - key: beta.kubernetes.io/os + - key: kubernetes.io/os operator: In values: - linux @@ -189,4 +189,4 @@ data: "ManageEndpointState": false, "ProgramSNATIPTables" : false } -# Toggle ManageEndpointState and ProgramSNATIPTables to true for delegated IPAM use case. \ No newline at end of file +# Toggle ManageEndpointState and ProgramSNATIPTables to true for delegated IPAM use case. diff --git a/hack/manifests/cni-installer.yaml b/hack/manifests/cni-installer.yaml index ef5fbe3ea0..67f4a2eae2 100644 --- a/hack/manifests/cni-installer.yaml +++ b/hack/manifests/cni-installer.yaml @@ -27,7 +27,7 @@ spec: operator: NotIn values: - virtual-kubelet - - key: beta.kubernetes.io/os + - key: kubernetes.io/os operator: In values: - linux diff --git a/hack/toolbox/manifests/agents.yaml b/hack/toolbox/manifests/agents.yaml index 68f7d9a383..e82b49398e 100644 --- a/hack/toolbox/manifests/agents.yaml +++ b/hack/toolbox/manifests/agents.yaml @@ -16,7 +16,7 @@ spec: app: agent-pod-8085-tcp-host spec: nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux kubernetes.io/role: agent hostNetwork: true containers: @@ -47,7 +47,7 @@ spec: app: agent-pod-8085-tcp spec: nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux kubernetes.io/role: agent containers: - name: agent-pod-8085-tcp @@ -77,7 +77,7 @@ spec: app: agent-pod-8086-udp spec: nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux kubernetes.io/role: agent containers: - name: agent-pod-8086-udp diff --git a/hack/toolbox/manifests/daemonset.yaml b/hack/toolbox/manifests/daemonset.yaml index e1bb2aac33..aeb1a8466d 100644 --- a/hack/toolbox/manifests/daemonset.yaml +++ b/hack/toolbox/manifests/daemonset.yaml @@ -26,7 +26,7 @@ spec: - key: CriticalAddonsOnly operator: Exists nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux kubernetes.io/role: agent containers: - name: azure-npm diff --git a/hack/toolbox/manifests/master.yaml b/hack/toolbox/manifests/master.yaml index 15e2134b31..842f86c9a3 100644 --- a/hack/toolbox/manifests/master.yaml +++ b/hack/toolbox/manifests/master.yaml @@ -16,7 +16,7 @@ spec: app: master-pod-8085-tcp-host spec: nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux kubernetes.io/role: master hostNetwork: true tolerations: @@ -55,7 +55,7 @@ spec: app: master-pod-8085-tcp spec: nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux kubernetes.io/role: master tolerations: - operator: "Exists" @@ -92,7 +92,7 @@ spec: app: master-pod-8086-udp spec: nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux kubernetes.io/role: master tolerations: - operator: "Exists" diff --git a/test/integration/manifests/cilium/cns-write-ovly.yaml b/test/integration/manifests/cilium/cns-write-ovly.yaml index 4f3d919757..4e0a6d7861 100644 --- a/test/integration/manifests/cilium/cns-write-ovly.yaml +++ b/test/integration/manifests/cilium/cns-write-ovly.yaml @@ -82,7 +82,7 @@ spec: operator: NotIn values: - virtual-kubelet - - key: beta.kubernetes.io/os + - key: kubernetes.io/os operator: In values: - linux diff --git a/test/integration/manifests/cns/daemonset-linux.yaml b/test/integration/manifests/cns/daemonset-linux.yaml index 3a30796e4d..a4af25a6cd 100644 --- a/test/integration/manifests/cns/daemonset-linux.yaml +++ b/test/integration/manifests/cns/daemonset-linux.yaml @@ -27,7 +27,7 @@ spec: operator: NotIn values: - virtual-kubelet - - key: beta.kubernetes.io/os + - key: kubernetes.io/os operator: In values: - linux diff --git a/test/scale/templates/kwok-node.yaml b/test/scale/templates/kwok-node.yaml index 249cc717af..00a72cc6e4 100644 --- a/test/scale/templates/kwok-node.yaml +++ b/test/scale/templates/kwok-node.yaml @@ -6,7 +6,6 @@ metadata: kwok.x-k8s.io/node: fake labels: beta.kubernetes.io/arch: amd64 - beta.kubernetes.io/os: linux kubernetes.io/arch: amd64 kubernetes.io/hostname: kwok-node-INSERT_NUMBER kubernetes.io/os: linux diff --git a/tools/acncli/deployment/manager_swift.yaml b/tools/acncli/deployment/manager_swift.yaml index edbdfb1423..58c3424314 100644 --- a/tools/acncli/deployment/manager_swift.yaml +++ b/tools/acncli/deployment/manager_swift.yaml @@ -13,7 +13,7 @@ spec: acn: azure-cni-manager spec: nodeSelector: - "beta.kubernetes.io/os": linux + "kubernetes.io/os": linux tolerations: - effect: NoSchedule key: node-role.kubernetes.io/master