Merge pull request #58639 from mburke5678/replace-deprecated-kube-labels

Replace deprecated kube labels

Author: mburke5678

contributing_to_docs/doc_guidelines.adoc

@@ -1271,7 +1271,7 @@ EOF
 ----
 Name:               node1.example.com
 Roles:              worker
-Labels:             beta.kubernetes.io/arch=amd64
+Labels:             kubernetes.io/arch=amd64
 ...
 Annotations:        cluster.k8s.io/machine: openshift-machine-api/ahardin-worker-us-east-2a-q5dzc
 ...

modules/nodes-nodes-viewing-listing.adoc

@@ -106,13 +106,16 @@ $ oc describe node node1.example.com
 ----
 Name:               node1.example.com <1>
 Roles:              worker <2>
-Labels:             beta.kubernetes.io/arch=amd64   <3>
-                    beta.kubernetes.io/instance-type=m4.large
-                    kubernetes.io/os=linux
-                    failure-domain.beta.kubernetes.io/region=us-east-2
-                    failure-domain.beta.kubernetes.io/zone=us-east-2a
-                    kubernetes.io/hostname=ip-10-0-140-16
+Labels:             kubernetes.io/os=linux
+                    kubernetes.io/hostname=ip-10-0-131-14
+                    kubernetes.io/arch=amd64 <3>
                     node-role.kubernetes.io/worker=
+                    node.kubernetes.io/instance-type=m4.large
+                    node.openshift.io/os_id=rhcos
+                    node.openshift.io/os_version=4.5
+                    region=east
+                    topology.kubernetes.io/region=us-east-1
+                    topology.kubernetes.io/zone=us-east-1a
 Annotations:        cluster.k8s.io/machine: openshift-machine-api/ahardin-worker-us-east-2a-q5dzc  <4>
                     machineconfiguration.openshift.io/currentConfig: worker-309c228e8b3a92e2235edd544c62fea8
                     machineconfiguration.openshift.io/desiredConfig: worker-309c228e8b3a92e2235edd544c62fea8

modules/nodes-scheduler-node-selectors-about.adoc

@@ -52,14 +52,14 @@ metadata:
   creationTimestamp: '2019-06-10T14:46:08Z'
   labels:
     kubernetes.io/os: linux
-    failure-domain.beta.kubernetes.io/zone: us-east-1a
+    topology.kubernetes.io/zone: us-east-1a
     node.openshift.io/os_version: '4.5'
     node-role.kubernetes.io/worker: ''
-    failure-domain.beta.kubernetes.io/region: us-east-1
+    topology.kubernetes.io/region: us-east-1
     node.openshift.io/os_id: rhcos
-    beta.kubernetes.io/instance-type: m4.large
+    node.kubernetes.io/instance-type: m4.large
     kubernetes.io/hostname: ip-10-0-131-14
-    beta.kubernetes.io/arch: amd64
+    kubernetes.io/arch: amd64
     region: east <1>
     type: user-node
 ----
@@ -79,14 +79,14 @@ metadata:
   creationTimestamp: '2019-06-10T14:46:08Z'
   labels:
     kubernetes.io/os: linux
-    failure-domain.beta.kubernetes.io/zone: us-east-1a
+    topology.kubernetes.io/zone: us-east-1a
     node.openshift.io/os_version: '4.5'
     node-role.kubernetes.io/worker: ''
-    failure-domain.beta.kubernetes.io/region: us-east-1
+    topology.kubernetes.io/region: us-east-1
     node.openshift.io/os_id: fedora
-    beta.kubernetes.io/instance-type: m4.large
+    node.kubernetes.io/instance-type: m4.large
     kubernetes.io/hostname: ip-10-0-131-14
-    beta.kubernetes.io/arch: amd64
+    kubernetes.io/arch: amd64
     region: east <1>
     type: user-node
 ----

modules/nodes-scheduler-pod-affinity-about.adoc

@@ -53,7 +53,7 @@ spec:
             operator: In <4>
             values:
             - S1 <3>
-        topologyKey: failure-domain.beta.kubernetes.io/zone
+        topologyKey: topology.kubernetes.io/zone
   containers:
   - name: with-pod-affinity
     image: docker.io/ocpqe/hello-pod

modules/nodes-scheduler-pod-affinity-configuring.adoc

@@ -43,7 +43,7 @@ spec:
             operator: In
             values:
             - S1
-        topologyKey: failure-domain.beta.kubernetes.io/zone
+        topologyKey: topology.kubernetes.io/zone
 ----
 +
 .. Specify an `operator`. The operator can be `In`, `NotIn`, `Exists`, or `DoesNotExist`. For example, use the operator `In` to require the label to be in the node.