Skip to content

Commit a157c88

Browse files
bergerhofferbergerhoffer
authored
Merge pull request #35409 from bergerhoffer/OSDOCS-2363
OSDOCS-2363: Updating 1.21 to 1.22 in example output
2 parents afadf63 + 7297d53 commit a157c88

34 files changed

+174
-175
lines changed

‎_unused_topics/cluster-logging-exported-fields-kubernetes.2021-06-04.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Data type:: group
7777

7878
== kubernetes.event
7979

80-
The kubernetes event obtained from kubernetes master API The event is already JSON object and as whole nested under kubernetes field This description should loosely follow 'type Event' in https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.21/#event-v1-core
80+
The kubernetes event obtained from kubernetes master API The event is already JSON object and as whole nested under kubernetes field This description should loosely follow 'type Event' in https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.22/#event-v1-core
8181

8282
[horizontal]
8383
Data type:: group

‎_unused_topics/looking-inside-nodes.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ $ oc get nodes
1414
1515
NAME STATUS ROLES AGE VERSION
1616
17-
ip-10-0-0-1.us-east-2.compute.internal Ready worker 3h19m v1.20.0
17+
ip-10-0-0-1.us-east-2.compute.internal Ready worker 3h19m v1.22.0
1818
19-
ip-10-0-0-39.us-east-2.compute.internal Ready master 3h37m v1.20.0
19+
ip-10-0-0-39.us-east-2.compute.internal Ready master 3h37m v1.22.0
2020
2121
…
2222

‎_unused_topics/understanding-workers-masters.adoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ To see which workers and masters are running on your cluster, type:
1313
$ oc get nodes
1414
1515
NAME STATUS ROLES AGE VERSION
16-
ip-10-0-0-1.us-east-2.compute.internal Ready worker 4h20m v1.20.0
17-
ip-10-0-0-2.us-east-2.compute.internal Ready master 4h39m v1.20.0
18-
ip-10-0-0.3.us-east-2.compute.internal Ready worker 4h20m v1.20.0
19-
ip-10-0-0-4.us-east-2.compute.internal Ready master 4h39m v1.20.0
20-
ip-10-0-0-5.us-east-2.compute.internal Ready master 4h39m v1.20.0
21-
ip-10-0-0-6.us-east-2.compute.internal Ready worker 4h20m v1.20.0
16+
ip-10-0-0-1.us-east-2.compute.internal Ready worker 4h20m v1.22.0
17+
ip-10-0-0-2.us-east-2.compute.internal Ready master 4h39m v1.22.0
18+
ip-10-0-0.3.us-east-2.compute.internal Ready worker 4h20m v1.22.0
19+
ip-10-0-0-4.us-east-2.compute.internal Ready master 4h39m v1.22.0
20+
ip-10-0-0-5.us-east-2.compute.internal Ready master 4h39m v1.22.0
21+
ip-10-0-0-6.us-east-2.compute.internal Ready worker 4h20m v1.22.0
2222
----
2323

2424
To see more information about internal and external IP addresses, the type of operating system ({op-system}), kernel version, and container runtime (CRI-O), add the `-o wide` option.
@@ -27,7 +27,7 @@ To see more information about internal and external IP addresses, the type of op
2727
$ oc get nodes -o wide
2828
2929
NAME                                       STATUS ROLES  AGE  VERSION  INTERNAL-IP   EXTERNAL-IP  OS-IMAGE             KERNEL-VERSION             CONTAINER-RUNTIME
30-
ip-10-0-134-252.us-east-2.compute.internal Ready worker 17h v1.20.0 10.0.134.252 <none> Red Hat CoreOS 4.0 3.10.0-957.5.1.el7.x86_64 cri-o://1.13.6-1.rhaos4.0.git2f0cb0d.el7
30+
ip-10-0-134-252.us-east-2.compute.internal Ready worker 17h v1.22.0 10.0.134.252 <none> Red Hat CoreOS 4.0 3.10.0-957.5.1.el7.x86_64 cri-o://1.22.0-1.rhaos4.0.git2f0cb0d.el7
3131
3232
....
3333
----

‎metering/configuring_metering/metering-common-config-options.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -155,12 +155,12 @@ $ oc get nodes
155155
[source,terminal]
156156
----
157157
NAME STATUS ROLES AGE VERSION
158-
ip-10-0-147-106.us-east-2.compute.internal Ready master 14h v1.21.0+6025c28
159-
ip-10-0-150-175.us-east-2.compute.internal Ready worker 14h v1.21.0+6025c28
160-
ip-10-0-175-23.us-east-2.compute.internal Ready master 14h v1.21.0+6025c28
161-
ip-10-0-189-6.us-east-2.compute.internal Ready worker 14h v1.21.0+6025c28
162-
ip-10-0-205-158.us-east-2.compute.internal Ready master 14h v1.21.0+6025c28
163-
ip-10-0-210-167.us-east-2.compute.internal Ready worker 14h v1.21.0+6025c28
158+
ip-10-0-147-106.us-east-2.compute.internal Ready master 14h v1.22.0
159+
ip-10-0-150-175.us-east-2.compute.internal Ready worker 14h v1.22.0
160+
ip-10-0-175-23.us-east-2.compute.internal Ready master 14h v1.22.0
161+
ip-10-0-189-6.us-east-2.compute.internal Ready worker 14h v1.22.0
162+
ip-10-0-205-158.us-east-2.compute.internal Ready master 14h v1.22.0
163+
ip-10-0-210-167.us-east-2.compute.internal Ready worker 14h v1.22.0
164164
----
165165
--
166166

‎modules/cluster-logging-exported-fields-kubernetes.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Data type:: group
8484

8585
=== kubernetes.event
8686

87-
The Kubernetes event obtained from the Kubernetes master API. This event description loosely follows `type Event` in link:https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.21/#event-v1-core[Event v1 core].
87+
The Kubernetes event obtained from the Kubernetes master API. This event description loosely follows `type Event` in link:https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.22/#event-v1-core[Event v1 core].
8888

8989
[horizontal]
9090
Data type:: group

‎modules/cnf-provisioning-real-time-and-low-latency-workloads.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ Note the worker with the role `worker-rt` that contains the string `4.18.0-211.r
8787
NAME STATUS ROLES AGE VERSION INTERNAL-IP
8888
EXTERNAL-IP OS-IMAGE KERNEL-VERSION
8989
CONTAINER-RUNTIME
90-
cnf-worker-0.example.com Ready worker,worker-rt 5d17h v1.21.0
90+
cnf-worker-0.example.com Ready worker,worker-rt 5d17h v1.22.0
9191
128.66.135.107 <none> Red Hat Enterprise Linux CoreOS 46.82.202008252340-0 (Ootpa)
92-
4.18.0-211.rt5.23.el8.x86_64 cri-o://1.21.0-90.rhaos4.8.git4a0ac05.el8-rc.1
92+
4.18.0-211.rt5.23.el8.x86_64 cri-o://1.22.0-90.rhaos4.8.git4a0ac05.el8-rc.1
9393
[...]
9494
----
9595

‎modules/graceful-restart.adoc

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ The control plane nodes are ready if the status is `Ready`, as shown in the foll
3434
[source,terminal]
3535
----
3636
NAME STATUS ROLES AGE VERSION
37-
ip-10-0-168-251.ec2.internal Ready master 75m v1.21.0
38-
ip-10-0-170-223.ec2.internal Ready master 75m v1.21.0
39-
ip-10-0-211-16.ec2.internal Ready master 75m v1.21.0
37+
ip-10-0-168-251.ec2.internal Ready master 75m v1.22.0
38+
ip-10-0-170-223.ec2.internal Ready master 75m v1.22.0
39+
ip-10-0-211-16.ec2.internal Ready master 75m v1.22.0
4040
----
4141

4242
. If the control plane nodes are _not_ ready, then check whether there are any pending certificate signing requests (CSRs) that must be approved.
@@ -75,9 +75,9 @@ The worker nodes are ready if the status is `Ready`, as shown in the following o
7575
[source,terminal]
7676
----
7777
NAME STATUS ROLES AGE VERSION
78-
ip-10-0-179-95.ec2.internal Ready worker 64m v1.21.0
79-
ip-10-0-182-134.ec2.internal Ready worker 64m v1.21.0
80-
ip-10-0-250-100.ec2.internal Ready worker 64m v1.21.0
78+
ip-10-0-179-95.ec2.internal Ready worker 64m v1.22.0
79+
ip-10-0-182-134.ec2.internal Ready worker 64m v1.22.0
80+
ip-10-0-250-100.ec2.internal Ready worker 64m v1.22.0
8181
----
8282

8383
. If the worker nodes are _not_ ready, then check whether there are any pending certificate signing requests (CSRs) that must be approved.
@@ -141,12 +141,12 @@ Check that the status for all nodes is `Ready`.
141141
[source,terminal]
142142
----
143143
NAME STATUS ROLES AGE VERSION
144-
ip-10-0-168-251.ec2.internal Ready master 82m v1.21.0
145-
ip-10-0-170-223.ec2.internal Ready master 82m v1.21.0
146-
ip-10-0-179-95.ec2.internal Ready worker 70m v1.21.0
147-
ip-10-0-182-134.ec2.internal Ready worker 70m v1.21.0
148-
ip-10-0-211-16.ec2.internal Ready master 82m v1.21.0
149-
ip-10-0-250-100.ec2.internal Ready worker 69m v1.21.0
144+
ip-10-0-168-251.ec2.internal Ready master 82m v1.22.0
145+
ip-10-0-170-223.ec2.internal Ready master 82m v1.22.0
146+
ip-10-0-179-95.ec2.internal Ready worker 70m v1.22.0
147+
ip-10-0-182-134.ec2.internal Ready worker 70m v1.22.0
148+
ip-10-0-211-16.ec2.internal Ready master 82m v1.22.0
149+
ip-10-0-250-100.ec2.internal Ready worker 69m v1.22.0
150150
----
151151

152152
If the cluster did not start properly, you might need to restore your cluster using an etcd backup.

‎modules/images-configuration-file.adoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ status:
5353
<1> `Image`: Holds cluster-wide information about how to handle images. The canonical, and only valid name is `cluster`.
5454
<2> `allowedRegistriesForImport`: Limits the container image registries from which normal users may import images. Set this list to the registries that you trust to contain valid images, and that you want applications to be able to import from. Users with permission to create images or `ImageStreamMappings` from the API are not affected by this policy. Typically only cluster administrators have the appropriate permissions.
5555
<3> `additionalTrustedCA`: A reference to a config map containing additional certificate authorities (CA) that are trusted during image stream import, pod image pull, `openshift-image-registry` pullthrough, and builds. The namespace for this config map is `openshift-config`. The format of the config map is to use the registry hostname as the key, and the PEM certificate as the value, for each additional registry CA to trust.
56-
<4> `registrySources`: Contains configuration that determines whether the container runtime allows or blocks individual registries when accessing images for builds and pods. Either the `allowedRegistries` parameter or the `blockedRegistries` parameter can be set, but not both. You can also define whether or not to allow access to insecure registries or registries that allow registries that use image short names. This example uses the `allowedRegistries` parameter, which defines the registries that are allowed to be used. The insecure registry `insecure.com` is also allowed. The `registrySources` paramter does not contain configuration for the internal cluster registry.
56+
<4> `registrySources`: Contains configuration that determines whether the container runtime allows or blocks individual registries when accessing images for builds and pods. Either the `allowedRegistries` parameter or the `blockedRegistries` parameter can be set, but not both. You can also define whether or not to allow access to insecure registries or registries that allow registries that use image short names. This example uses the `allowedRegistries` parameter, which defines the registries that are allowed to be used. The insecure registry `insecure.com` is also allowed. The `registrySources` paramter does not contain configuration for the internal cluster registry.
5757
+
5858
[NOTE]
5959
====
@@ -75,10 +75,10 @@ $ oc get nodes
7575
[source,terminal]
7676
----
7777
NAME STATUS ROLES AGE VERSION
78-
ci-ln-j5cd0qt-f76d1-vfj5x-master-0 Ready master 98m v1.19.0+7070803
79-
ci-ln-j5cd0qt-f76d1-vfj5x-master-1 Ready,SchedulingDisabled master 99m v1.19.0+7070803
80-
ci-ln-j5cd0qt-f76d1-vfj5x-master-2 Ready master 98m v1.19.0+7070803
81-
ci-ln-j5cd0qt-f76d1-vfj5x-worker-b-nsnd4 Ready worker 90m v1.19.0+7070803
82-
ci-ln-j5cd0qt-f76d1-vfj5x-worker-c-5z2gz NotReady,SchedulingDisabled worker 90m v1.19.0+7070803
83-
ci-ln-j5cd0qt-f76d1-vfj5x-worker-d-stsjv Ready worker 90m v1.19.0+7070803
78+
ci-ln-j5cd0qt-f76d1-vfj5x-master-0 Ready master 98m v1.22.0
79+
ci-ln-j5cd0qt-f76d1-vfj5x-master-1 Ready,SchedulingDisabled master 99m v1.22.0
80+
ci-ln-j5cd0qt-f76d1-vfj5x-master-2 Ready master 98m v1.22.0
81+
ci-ln-j5cd0qt-f76d1-vfj5x-worker-b-nsnd4 Ready worker 90m v1.22.0
82+
ci-ln-j5cd0qt-f76d1-vfj5x-worker-c-5z2gz NotReady,SchedulingDisabled worker 90m v1.22.0
83+
ci-ln-j5cd0qt-f76d1-vfj5x-worker-d-stsjv Ready worker 90m v1.22.0
8484
----

‎modules/images-configuration-registry-mirror.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,12 @@ $ oc get node
106106
[source,terminal]
107107
----
108108
NAME STATUS ROLES AGE VERSION
109-
ip-10-0-137-44.ec2.internal Ready worker 7m v1.21.0
110-
ip-10-0-138-148.ec2.internal Ready master 11m v1.21.0
111-
ip-10-0-139-122.ec2.internal Ready master 11m v1.21.0
112-
ip-10-0-147-35.ec2.internal Ready,SchedulingDisabled worker 7m v1.21.0
113-
ip-10-0-153-12.ec2.internal Ready worker 7m v1.21.0
114-
ip-10-0-154-10.ec2.internal Ready master 11m v1.21.0
109+
ip-10-0-137-44.ec2.internal Ready worker 7m v1.22.0
110+
ip-10-0-138-148.ec2.internal Ready master 11m v1.22.0
111+
ip-10-0-139-122.ec2.internal Ready master 11m v1.22.0
112+
ip-10-0-147-35.ec2.internal Ready,SchedulingDisabled worker 7m v1.22.0
113+
ip-10-0-153-12.ec2.internal Ready worker 7m v1.22.0
114+
ip-10-0-154-10.ec2.internal Ready master 11m v1.22.0
115115
----
116116
+
117117
You can see that scheduling on each worker node is disabled as the change is being applied.

‎modules/infrastructure-moving-logging.adoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,13 @@ $ oc get nodes
9797
[source,terminal]
9898
----
9999
NAME STATUS ROLES AGE VERSION
100-
ip-10-0-133-216.us-east-2.compute.internal Ready master 60m v1.21.0
101-
ip-10-0-139-146.us-east-2.compute.internal Ready master 60m v1.21.0
102-
ip-10-0-139-192.us-east-2.compute.internal Ready worker 51m v1.21.0
103-
ip-10-0-139-241.us-east-2.compute.internal Ready worker 51m v1.21.0
104-
ip-10-0-147-79.us-east-2.compute.internal Ready worker 51m v1.21.0
105-
ip-10-0-152-241.us-east-2.compute.internal Ready master 60m v1.21.0
106-
ip-10-0-139-48.us-east-2.compute.internal Ready infra 51m v1.21.0
100+
ip-10-0-133-216.us-east-2.compute.internal Ready master 60m v1.22.0
101+
ip-10-0-139-146.us-east-2.compute.internal Ready master 60m v1.22.0
102+
ip-10-0-139-192.us-east-2.compute.internal Ready worker 51m v1.22.0
103+
ip-10-0-139-241.us-east-2.compute.internal Ready worker 51m v1.22.0
104+
ip-10-0-147-79.us-east-2.compute.internal Ready worker 51m v1.22.0
105+
ip-10-0-152-241.us-east-2.compute.internal Ready master 60m v1.22.0
106+
ip-10-0-139-48.us-east-2.compute.internal Ready infra 51m v1.22.0
107107
----
108108
+
109109
Note that the node has a `node-role.kubernetes.io/infra: ''` label:

0 commit comments

Comments
 (0)