Skip to content

Commit 79f7b88

Browse files
author
Michael Burke
committed
Replace deprecated Kubernetes labels
1 parent cb26a3c commit 79f7b88

File tree

5 files changed

+20
-17
lines changed

5 files changed

+20
-17
lines changed

contributing_to_docs/doc_guidelines.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1264,7 +1264,7 @@ EOF
12641264
----
12651265
Name: node1.example.com
12661266
Roles: worker
1267-
Labels: beta.kubernetes.io/arch=amd64
1267+
Labels: kubernetes.io/arch=amd64
12681268
...
12691269
Annotations: cluster.k8s.io/machine: openshift-machine-api/ahardin-worker-us-east-2a-q5dzc
12701270
...

modules/nodes-nodes-viewing-listing.adoc

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,13 +106,16 @@ $ oc describe node node1.example.com
106106
----
107107
Name: node1.example.com <1>
108108
Roles: worker <2>
109-
Labels: beta.kubernetes.io/arch=amd64 <3>
110-
beta.kubernetes.io/instance-type=m4.large
111-
kubernetes.io/os=linux
112-
failure-domain.beta.kubernetes.io/region=us-east-2
113-
failure-domain.beta.kubernetes.io/zone=us-east-2a
114-
kubernetes.io/hostname=ip-10-0-140-16
109+
Labels: kubernetes.io/os=linux
110+
kubernetes.io/hostname=ip-10-0-131-14
111+
kubernetes.io/arch=amd64 <3>
115112
node-role.kubernetes.io/worker=
113+
node.kubernetes.io/instance-type=m4.large
114+
node.openshift.io/os_id=rhcos
115+
node.openshift.io/os_version=4.5
116+
region=east
117+
topology.kubernetes.io/region=us-east-1
118+
topology.kubernetes.io/zone=us-east-1a
116119
Annotations: cluster.k8s.io/machine: openshift-machine-api/ahardin-worker-us-east-2a-q5dzc <4>
117120
machineconfiguration.openshift.io/currentConfig: worker-309c228e8b3a92e2235edd544c62fea8
118121
machineconfiguration.openshift.io/desiredConfig: worker-309c228e8b3a92e2235edd544c62fea8

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ metadata:
5252
creationTimestamp: '2019-06-10T14:46:08Z'
5353
labels:
5454
kubernetes.io/os: linux
55-
failure-domain.beta.kubernetes.io/zone: us-east-1a
55+
topology.kubernetes.io/zone: us-east-1a
5656
node.openshift.io/os_version: '4.5'
5757
node-role.kubernetes.io/worker: ''
58-
failure-domain.beta.kubernetes.io/region: us-east-1
58+
topology.kubernetes.io/region: us-east-1
5959
node.openshift.io/os_id: rhcos
60-
beta.kubernetes.io/instance-type: m4.large
60+
node.kubernetes.io/instance-type: m4.large
6161
kubernetes.io/hostname: ip-10-0-131-14
62-
beta.kubernetes.io/arch: amd64
62+
kubernetes.io/arch: amd64
6363
region: east <1>
6464
----
6565
<1> Label to match the pod node selector.
@@ -78,14 +78,14 @@ metadata:
7878
creationTimestamp: '2019-06-10T14:46:08Z'
7979
labels:
8080
kubernetes.io/os: linux
81-
failure-domain.beta.kubernetes.io/zone: us-east-1a
81+
topology.kubernetes.io/zone: us-east-1a
8282
node.openshift.io/os_version: '4.5'
8383
node-role.kubernetes.io/worker: ''
84-
failure-domain.beta.kubernetes.io/region: us-east-1
84+
topology.kubernetes.io/region: us-east-1
8585
node.openshift.io/os_id: fedora
86-
beta.kubernetes.io/instance-type: m4.large
86+
node.kubernetes.io/instance-type: m4.large
8787
kubernetes.io/hostname: ip-10-0-131-14
88-
beta.kubernetes.io/arch: amd64
88+
kubernetes.io/arch: amd64
8989
region: east <1>
9090
----
9191
<1> Label to match the pod node selector.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ spec:
4848
operator: In <4>
4949
values:
5050
- S1 <3>
51-
topologyKey: failure-domain.beta.kubernetes.io/zone
51+
topologyKey: topology.kubernetes.io/zone
5252
containers:
5353
- name: with-pod-affinity
5454
image: docker.io/ocpqe/hello-pod

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ spec:
4343
operator: In
4444
values:
4545
- S1
46-
topologyKey: failure-domain.beta.kubernetes.io/zone
46+
topologyKey: topology.kubernetes.io/zone
4747
----
4848
+
4949
.. 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.

0 commit comments

Comments
 (0)