diff --git a/cluster/addons/dashboard/dashboard-deployment.yaml b/cluster/addons/dashboard/dashboard-deployment.yaml index 6af2a73d186..c61fe8b595a 100644 --- a/cluster/addons/dashboard/dashboard-deployment.yaml +++ b/cluster/addons/dashboard/dashboard-deployment.yaml @@ -63,7 +63,7 @@ spec: emptyDir: {} serviceAccountName: kubernetes-dashboard nodeSelector: - "beta.kubernetes.io/os": linux + "kubernetes.io/os": linux tolerations: - key: "CriticalAddonsOnly" operator: "Exists" diff --git a/cluster/addons/dns-horizontal-autoscaler/dns-horizontal-autoscaler.yaml b/cluster/addons/dns-horizontal-autoscaler/dns-horizontal-autoscaler.yaml index 0bd70934b8f..c0c45b54ad1 100644 --- a/cluster/addons/dns-horizontal-autoscaler/dns-horizontal-autoscaler.yaml +++ b/cluster/addons/dns-horizontal-autoscaler/dns-horizontal-autoscaler.yaml @@ -106,5 +106,5 @@ spec: - key: "CriticalAddonsOnly" operator: "Exists" nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux serviceAccountName: kube-dns-autoscaler diff --git a/cluster/addons/dns/coredns/coredns.yaml.base b/cluster/addons/dns/coredns/coredns.yaml.base index 3445761b431..a8f0afb5085 100644 --- a/cluster/addons/dns/coredns/coredns.yaml.base +++ b/cluster/addons/dns/coredns/coredns.yaml.base @@ -115,7 +115,7 @@ spec: - key: "CriticalAddonsOnly" operator: "Exists" nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux containers: - name: coredns image: k8s.gcr.io/coredns:1.6.5 diff --git a/cluster/addons/dns/coredns/coredns.yaml.in b/cluster/addons/dns/coredns/coredns.yaml.in index 06753f117df..ad65d946095 100644 --- a/cluster/addons/dns/coredns/coredns.yaml.in +++ b/cluster/addons/dns/coredns/coredns.yaml.in @@ -115,7 +115,7 @@ spec: - key: "CriticalAddonsOnly" operator: "Exists" nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux containers: - name: coredns image: k8s.gcr.io/coredns:1.6.5 diff --git a/cluster/addons/dns/coredns/coredns.yaml.sed b/cluster/addons/dns/coredns/coredns.yaml.sed index 663a93d2773..3c86e5749a5 100644 --- a/cluster/addons/dns/coredns/coredns.yaml.sed +++ b/cluster/addons/dns/coredns/coredns.yaml.sed @@ -115,7 +115,7 @@ spec: - key: "CriticalAddonsOnly" operator: "Exists" nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux containers: - name: coredns image: k8s.gcr.io/coredns:1.6.5 diff --git a/cluster/addons/dns/kube-dns/kube-dns.yaml.base b/cluster/addons/dns/kube-dns/kube-dns.yaml.base index 9333d7c9575..5e6a938a859 100644 --- a/cluster/addons/dns/kube-dns/kube-dns.yaml.base +++ b/cluster/addons/dns/kube-dns/kube-dns.yaml.base @@ -94,7 +94,7 @@ spec: - key: "CriticalAddonsOnly" operator: "Exists" nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux volumes: - name: kube-dns-config configMap: diff --git a/cluster/addons/dns/kube-dns/kube-dns.yaml.in b/cluster/addons/dns/kube-dns/kube-dns.yaml.in index 165390ad8e0..ff592801bdf 100644 --- a/cluster/addons/dns/kube-dns/kube-dns.yaml.in +++ b/cluster/addons/dns/kube-dns/kube-dns.yaml.in @@ -94,7 +94,7 @@ spec: - key: "CriticalAddonsOnly" operator: "Exists" nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux volumes: - name: kube-dns-config configMap: diff --git a/cluster/addons/dns/kube-dns/kube-dns.yaml.sed b/cluster/addons/dns/kube-dns/kube-dns.yaml.sed index 61122e1b0bf..9c8360f526c 100644 --- a/cluster/addons/dns/kube-dns/kube-dns.yaml.sed +++ b/cluster/addons/dns/kube-dns/kube-dns.yaml.sed @@ -94,7 +94,7 @@ spec: - key: "CriticalAddonsOnly" operator: "Exists" nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux volumes: - name: kube-dns-config configMap: diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml b/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml index 5921f9ab969..0e837ef98ab 100644 --- a/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml +++ b/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml @@ -98,7 +98,7 @@ spec: fieldPath: metadata.namespace # END_PROMETHEUS_TO_SD nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux terminationGracePeriodSeconds: 60 tolerations: - operator: "Exists" diff --git a/cluster/addons/kube-proxy/kube-proxy-ds.yaml b/cluster/addons/kube-proxy/kube-proxy-ds.yaml index 591d72c481c..83a6c6771c4 100644 --- a/cluster/addons/kube-proxy/kube-proxy-ds.yaml +++ b/cluster/addons/kube-proxy/kube-proxy-ds.yaml @@ -25,7 +25,7 @@ spec: priorityClassName: system-node-critical hostNetwork: true nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux node.kubernetes.io/kube-proxy-ds-ready: "true" tolerations: - operator: "Exists" diff --git a/cluster/addons/metadata-proxy/gce/metadata-proxy.yaml b/cluster/addons/metadata-proxy/gce/metadata-proxy.yaml index 7267a393dc5..2d07cd48f6b 100644 --- a/cluster/addons/metadata-proxy/gce/metadata-proxy.yaml +++ b/cluster/addons/metadata-proxy/gce/metadata-proxy.yaml @@ -84,5 +84,5 @@ spec: # END_PROMETHEUS_TO_SD nodeSelector: cloud.google.com/metadata-proxy-ready: "true" - beta.kubernetes.io/os: linux + kubernetes.io/os: linux terminationGracePeriodSeconds: 30 diff --git a/cluster/gce/windows/smoke-test.sh b/cluster/gce/windows/smoke-test.sh index b7ceed08eb4..9e9bb38492e 100755 --- a/cluster/gce/windows/smoke-test.sh +++ b/cluster/gce/windows/smoke-test.sh @@ -45,13 +45,13 @@ output_file=/tmp/k8s-smoke-test.out function check_windows_nodes_are_ready { # kubectl filtering is the worst. - statuses=$(${kubectl} get nodes -l beta.kubernetes.io/os=windows \ + statuses=$(${kubectl} get nodes -l kubernetes.io/os=windows \ -o jsonpath='{.items[*].status.conditions[?(@.type=="Ready")].status}') for status in $statuses; do if [[ $status == "False" ]]; then echo "ERROR: some Windows node has status != Ready" - echo "kubectl get nodes -l beta.kubernetes.io/os=windows" - ${kubectl} get nodes -l beta.kubernetes.io/os=windows + echo "kubectl get nodes -l kubernetes.io/os=windows" + ${kubectl} get nodes -l kubernetes.io/os=windows exit 1 fi done @@ -61,7 +61,7 @@ function check_windows_nodes_are_ready { function untaint_windows_nodes { # Untaint the windows nodes to allow test workloads without tolerations to be # scheduled onto them. - WINDOWS_NODES=$(${kubectl} get nodes -l beta.kubernetes.io/os=windows -o name) + WINDOWS_NODES=$(${kubectl} get nodes -l kubernetes.io/os=windows -o name) for node in $WINDOWS_NODES; do ${kubectl} taint node "$node" node.kubernetes.io/os:NoSchedule- done @@ -106,7 +106,7 @@ spec: - name: nginx image: nginx:1.7.9 nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux EOF if ! ${kubectl} create -f $linux_webserver_deployment.yaml; then @@ -183,7 +183,7 @@ spec: image: ubuntu command: ["sleep", "123456"] nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux EOF if ! ${kubectl} create -f $linux_command_deployment.yaml; then @@ -280,7 +280,7 @@ spec: args: - serve-hostname nodeSelector: - beta.kubernetes.io/os: windows + kubernetes.io/os: windows tolerations: - effect: NoSchedule key: node.kubernetes.io/os @@ -360,7 +360,7 @@ spec: - name: pause-win image: gcr.io/gke-release/pause-win:1.1.0 nodeSelector: - beta.kubernetes.io/os: windows + kubernetes.io/os: windows tolerations: - effect: NoSchedule key: node.kubernetes.io/os diff --git a/cmd/kubeadm/app/phases/addons/dns/manifests.go b/cmd/kubeadm/app/phases/addons/dns/manifests.go index c6868deb025..737d9d97cbe 100644 --- a/cmd/kubeadm/app/phases/addons/dns/manifests.go +++ b/cmd/kubeadm/app/phases/addons/dns/manifests.go @@ -241,7 +241,7 @@ spec: - key: {{ .ControlPlaneTaintKey }} effect: NoSchedule nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux containers: - name: coredns image: {{ .Image }} diff --git a/cmd/kubeadm/app/phases/addons/proxy/manifests.go b/cmd/kubeadm/app/phases/addons/proxy/manifests.go index 497d18cfe9b..9f2a6a2fe92 100644 --- a/cmd/kubeadm/app/phases/addons/proxy/manifests.go +++ b/cmd/kubeadm/app/phases/addons/proxy/manifests.go @@ -113,6 +113,6 @@ spec: operator: Exists - operator: Exists nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux ` ) diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/node.yaml b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/node.yaml index e04393811e7..13a14cf449b 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/node.yaml +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/node.yaml @@ -7,10 +7,10 @@ metadata: volumes.kubernetes.io/controller-managed-attach-detach: "true" creationTimestamp: "2019-07-09T16:17:29Z" labels: - beta.kubernetes.io/arch: amd64 + kubernetes.io/arch: amd64 beta.kubernetes.io/fluentd-ds-ready: "true" beta.kubernetes.io/instance-type: n1-standard-4 - beta.kubernetes.io/os: linux + kubernetes.io/os: linux cloud.google.com/gke-nodepool: default-pool cloud.google.com/gke-os-distribution: cos failure-domain.beta.kubernetes.io/region: us-central1 diff --git a/test/e2e/storage/drivers/in_tree.go b/test/e2e/storage/drivers/in_tree.go index 99a8e3c0080..6999d5c5101 100644 --- a/test/e2e/storage/drivers/in_tree.go +++ b/test/e2e/storage/drivers/in_tree.go @@ -1319,7 +1319,7 @@ func (g *gcePdDriver) PrepareTest(f *framework.Framework) (*testsuites.PerTestCo if framework.NodeOSDistroIs("windows") { config.ClientNodeSelection = e2epod.NodeSelection{ Selector: map[string]string{ - "beta.kubernetes.io/os": "windows", + "kubernetes.io/os": "windows", }, } } @@ -1716,7 +1716,7 @@ func (a *awsDriver) PrepareTest(f *framework.Framework) (*testsuites.PerTestConf if framework.NodeOSDistroIs("windows") { config.ClientNodeSelection = e2epod.NodeSelection{ Selector: map[string]string{ - "beta.kubernetes.io/os": "windows", + "kubernetes.io/os": "windows", }, } } diff --git a/test/e2e/windows/density.go b/test/e2e/windows/density.go index d90e966b9a6..47a0e7df008 100644 --- a/test/e2e/windows/density.go +++ b/test/e2e/windows/density.go @@ -236,7 +236,7 @@ func newDensityTestPods(numPods int, volume bool, imageName, podType string) []* }, }, NodeSelector: map[string]string{ - "beta.kubernetes.io/os": "windows", + "kubernetes.io/os": "windows", }, }, } diff --git a/test/e2e/windows/hybrid_network.go b/test/e2e/windows/hybrid_network.go index 82a6fc4bc68..422a2f48ec5 100644 --- a/test/e2e/windows/hybrid_network.go +++ b/test/e2e/windows/hybrid_network.go @@ -117,7 +117,7 @@ func createTestPod(f *framework.Framework, image string, os string) *v1.Pod { }, }, NodeSelector: map[string]string{ - "beta.kubernetes.io/os": os, + "kubernetes.io/os": os, }, }, } diff --git a/test/e2e/windows/memory_limits.go b/test/e2e/windows/memory_limits.go index 46df390cc08..3a87e30e592 100644 --- a/test/e2e/windows/memory_limits.go +++ b/test/e2e/windows/memory_limits.go @@ -168,7 +168,7 @@ func newMemLimitTestPods(numPods int, imageName, podType string, memoryLimit str }, }, NodeSelector: map[string]string{ - "beta.kubernetes.io/os": "windows", + "kubernetes.io/os": "windows", }, }, } @@ -181,7 +181,7 @@ func newMemLimitTestPods(numPods int, imageName, podType string, memoryLimit str // getNodeMemory populates a nodeMemory struct with information from the first func getNodeMemory(f *framework.Framework) nodeMemory { - selector := labels.Set{"beta.kubernetes.io/os": "windows"}.AsSelector() + selector := labels.Set{"kubernetes.io/os": "windows"}.AsSelector() nodeList, err := f.ClientSet.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{ LabelSelector: selector.String(), }) @@ -232,7 +232,7 @@ func getNodeMemory(f *framework.Framework) nodeMemory { // getTotalAllocatableMemory gets the sum of all agent node's allocatable memory func getTotalAllocatableMemory(f *framework.Framework) *resource.Quantity { - selector := labels.Set{"beta.kubernetes.io/os": "windows"}.AsSelector() + selector := labels.Set{"kubernetes.io/os": "windows"}.AsSelector() nodeList, err := f.ClientSet.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{ LabelSelector: selector.String(), })