Skip to content

Commit fe668e6

Browse files
committed
Change to 'label'
1 parent 05c184c commit fe668e6

File tree

4 files changed

+23
-25
lines changed

4 files changed

+23
-25
lines changed

modules/nodes-pods-secrets-certificates-creating.adoc

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -56,36 +56,34 @@ $ oc get secrets
5656
.Example output
5757
[source,terminal]
5858
----
59-
NAME TYPE DATA AGE
59+
NAME TYPE DATA AGE
6060
my-cert kubernetes.io/tls 2 9m
6161
----
6262
+
6363
.. View details on your secret:
6464
+
6565
[source,terminal]
6666
----
67-
$ oc describe secret my-service-pod
67+
$ oc describe secret my-cert
6868
----
6969
+
7070
.Example output
7171
[source,terminal]
7272
----
73-
Name: my-service-pod
73+
Name: my-cert
7474
Namespace: openshift-console
7575
Labels: <none>
76-
Annotations: kubernetes.io/service-account.name: builder
77-
kubernetes.io/service-account.uid: ab-11e9-988a-0eb4e1b4a396
76+
Annotations: service.alpha.openshift.io/expiry: 2023-03-08T23:22:40Z
77+
service.alpha.openshift.io/originating-service-name: my-service
78+
service.alpha.openshift.io/originating-service-uid: 640f0ec3-afc2-4380-bf31-a8c784846a11
79+
service.beta.openshift.io/expiry: 2023-03-08T23:22:40Z
7880
79-
Type: kubernetes.io/service-account-token
81+
Type: kubernetes.io/tls
8082
8183
Data
82-
83-
ca.crt: 5802 bytes
84-
namespace: 17 bytes
85-
token: eyJhbGciOiJSUzI1NiIsImtpZCI6IiJ9.eyJpc3MiOiJrdWJlcm5ldGVzL3NlcnZpY2VhY2NvdW50Ii
86-
wia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9uYW1lc3BhY2UiOiJvcGVuc2hpZnQtY29uc29sZSIsImt1YmVyb
87-
cnZpY2VhY2NvdW50L3NlcnZpY2UtYWNjb3VudC51aWQiOiJhYmE4Y2UyZC00MzVlLTExZTktOTg4YS0wZWI0ZTFiNGEz
88-
OTYiLCJzdWIiOiJzeXN0ZW06c2VydmljZWFjY291bnQ6b3BlbnNoaWZ
84+
====
85+
tls.key: 1679 bytes
86+
tls.crt: 2595 bytes
8987
----
9088

9189
. Edit your `Pod` spec with that secret.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,13 +137,13 @@ After making this change, wait for the pods in the `openshift-kube-apiserver` pr
137137

138138
* Use a `MachineSet` object to add labels to nodes managed by the machine set when a node is created:
139139

140-
.. Run the following command to add a node selector to a `MachineSet` object:
140+
.. Run the following command to add labels to a `MachineSet` object:
141141
+
142142
[source,terminal]
143143
----
144144
$ oc patch MachineSet <name> --type='json' -p='[{"op":"add","path":"/spec/template/spec/metadata/labels", "value":{"<key>"="<value>","<key>"="<value>"}}]' -n openshift-machine-api <1>
145145
----
146-
<1> Add a `<key>/<value>` pair for each node selector.
146+
<1> Add a `<key>/<value>` pair for each label.
147147
+
148148
For example:
149149
+
@@ -152,7 +152,7 @@ For example:
152152
$ oc patch MachineSet ci-ln-l8nry52-f76d1-hl7m7-worker-c --type='json' -p='[{"op":"add","path":"/spec/template/spec/metadata/labels", "value":{"type":"user-node","region":"east"}}]' -n openshift-machine-api
153153
----
154154
+
155-
.. Verify that the label is added to the `MachineSet` object by using the `oc edit` command:
155+
.. Verify that the labels are added to the `MachineSet` object by using the `oc edit` command:
156156
+
157157
For example:
158158
+
@@ -231,7 +231,7 @@ For example, to label a node:
231231
$ oc label nodes ci-ln-l8nry52-f76d1-hl7m7-worker-b-tgq49 type=user-node region=east
232232
----
233233

234-
.. Verify that the label is added to the node using the `oc get` command:
234+
.. Verify that the labels are added to the node using the `oc get` command:
235235
+
236236
[source,terminal]
237237
----

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[id="nodes-scheduler-node-selectors-pod_{context}"]
66
= Using node selectors to control pod placement
77

8-
You can use node selector labels on pods to control where the pod is scheduled.
8+
You can use node selectors on pods to control where the pod is scheduled.
99

1010
With node selectors, {product-title} schedules the pods on nodes that contain matching labels.
1111

@@ -64,7 +64,7 @@ The web console lists the controlling object under `ownerReferences` in the pod
6464

6565
* Use a `MachineSet` object to add labels to nodes managed by the machine set when a node is created:
6666

67-
.. Run the following command to add a node selector to a `MachineSet` object:
67+
.. Run the following command to add labels to a `MachineSet` object:
6868
+
6969
[source,terminal]
7070
----
@@ -78,7 +78,7 @@ For example:
7878
$ oc patch MachineSet abc612-msrtw-worker-us-east-1c --type='json' -p='[{"op":"add","path":"/spec/template/spec/metadata/labels", "value":{"type":"user-node","region":"east"}}]' -n openshift-machine-api
7979
----
8080

81-
.. Verify that the label is added to the `MachineSet` object by using the `oc edit` command:
81+
.. Verify that the labels are added to the `MachineSet` object by using the `oc edit` command:
8282
+
8383
For example:
8484
+
@@ -124,7 +124,7 @@ For example, to label a node:
124124
$ oc label nodes ip-10-0-142-25.ec2.internal type=user-node region=east
125125
----
126126

127-
.. Verify that the label is added to the node:
127+
.. Verify that the labels are added to the node:
128128
+
129129
[source,terminal]
130130
----

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ You can use node selectors in a project together with labels on nodes to constra
99

1010
When you create a pod in this project, {product-title} adds the node selectors to the pods in the project and schedules the pods on a node with matching labels in the project. If there is a cluster-wide default node selector, a project node selector takes preference.
1111

12-
You add labels to a project by editing the `Namespace` object to add the `openshift.io/node-selector` parameter, which contains the label definitions. You add labels to a node by editing the `Node` object, a `MachineSet` object, or a `MachineConfig` object. Adding the label to the machine set ensures that if the node or machine goes down, new nodes have the label. Labels added to a node or machine config do not persist if the node or machine goes down.
12+
You add node selectors to a project by editing the `Namespace` object to add the `openshift.io/node-selector` parameter. You add labels to a node by editing the `Node` object, a `MachineSet` object, or a `MachineConfig` object. Adding the label to the machine set ensures that if the node or machine goes down, new nodes have the label. Labels added to a node or machine config do not persist if the node or machine goes down.
1313

1414
[NOTE]
1515
====
@@ -135,7 +135,7 @@ status:
135135

136136
* Use a `MachineSet` object to add labels to nodes managed by the machine set when a node is created:
137137

138-
.. Run the following command to add a node selector to a `MachineSet` object:
138+
.. Run the following command to add labels to a `MachineSet` object:
139139
+
140140
[source,terminal]
141141
----
@@ -149,7 +149,7 @@ For example:
149149
$ oc patch MachineSet ci-ln-l8nry52-f76d1-hl7m7-worker-c --type='json' -p='[{"op":"add","path":"/spec/template/spec/metadata/labels", "value":{"type":"user-node","region":"east"}}]' -n openshift-machine-api
150150
----
151151

152-
.. Verify that the label is added to the `MachineSet` object by using the `oc edit` command:
152+
.. Verify that the labels are added to the `MachineSet` object by using the `oc edit` command:
153153
+
154154
For example:
155155
+
@@ -228,7 +228,7 @@ For example, to label a node:
228228
$ oc label nodes ci-ln-l8nry52-f76d1-hl7m7-worker-c-tgq49 type=user-node region=east
229229
----
230230

231-
.. Verify that the label is added to the `Node` object using the `oc get` command:
231+
.. Verify that the labels are added to the `Node` object using the `oc get` command:
232232
+
233233
[source,terminal]
234234
----

0 commit comments

Comments
 (0)