Skip to content

Commit 580f453

Browse files
authored
Merge pull request #91287 from mburke5678/mco-update-ignition-34-415
[enterprise-4.15] OCPBUGS39023: Possibly wrong statement in documentation on Ignition version to be use
2 parents 062da8e + 881dd86 commit 580f453

12 files changed

+66
-66
lines changed

modules/checking-mco-status.adoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,13 @@ $ oc get machineconfigs
102102
[source,terminal]
103103
----
104104
NAME GENERATEDBYCONTROLLER IGNITIONVERSION AGE
105-
00-master 2c9371fbb673b97a6fe8b1c52... 3.2.0 5h18m
106-
00-worker 2c9371fbb673b97a6fe8b1c52... 3.2.0 5h18m
107-
01-master-container-runtime 2c9371fbb673b97a6fe8b1c52... 3.2.0 5h18m
108-
01-master-kubelet 2c9371fbb673b97a6fe8b1c52… 3.2.0 5h18m
105+
00-master 2c9371fbb673b97a6fe8b1c52... 3.4.0 5h18m
106+
00-worker 2c9371fbb673b97a6fe8b1c52... 3.4.0 5h18m
107+
01-master-container-runtime 2c9371fbb673b97a6fe8b1c52... 3.4.0 5h18m
108+
01-master-kubelet 2c9371fbb673b97a6fe8b1c52… 3.4.0 5h18m
109109
...
110-
rendered-master-dde... 2c9371fbb673b97a6fe8b1c52... 3.2.0 5h18m
111-
rendered-worker-fde... 2c9371fbb673b97a6fe8b1c52... 3.2.0 5h18m
110+
rendered-master-dde... 2c9371fbb673b97a6fe8b1c52... 3.4.0 5h18m
111+
rendered-worker-fde... 2c9371fbb673b97a6fe8b1c52... 3.4.0 5h18m
112112
----
113113
+
114114
Note that the `MachineConfig` objects listed as `rendered` are not meant to be changed or deleted.
@@ -130,7 +130,7 @@ Name: 01-master-kubelet
130130
Spec:
131131
Config:
132132
Ignition:
133-
Version: 3.2.0
133+
Version: 3.4.0
134134
Storage:
135135
Files:
136136
Contents:

modules/cnf-disable-chronyd.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ metadata:
3030
spec:
3131
config:
3232
ignition:
33-
version: 3.2.0
33+
version: 3.4.0
3434
systemd:
3535
units:
3636
- contents: |

modules/core-user-password.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ metadata:
4545
spec:
4646
config:
4747
ignition:
48-
version: 3.2.0
48+
version: 3.4.0
4949
passwd:
5050
users:
5151
- name: core <1>

modules/coreos-layering-configuring.adoc

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -99,20 +99,20 @@ $ oc get mc
9999
[source,terminal]
100100
----
101101
NAME GENERATEDBYCONTROLLER IGNITIONVERSION AGE
102-
00-master 5bdb57489b720096ef912f738b46330a8f577803 3.2.0 95m
103-
00-worker 5bdb57489b720096ef912f738b46330a8f577803 3.2.0 95m
104-
01-master-container-runtime 5bdb57489b720096ef912f738b46330a8f577803 3.2.0 95m
105-
01-master-kubelet 5bdb57489b720096ef912f738b46330a8f577803 3.2.0 95m
106-
01-worker-container-runtime 5bdb57489b720096ef912f738b46330a8f577803 3.2.0 95m
107-
01-worker-kubelet 5bdb57489b720096ef912f738b46330a8f577803 3.2.0 95m
108-
99-master-generated-registries 5bdb57489b720096ef912f738b46330a8f577803 3.2.0 95m
102+
00-master 5bdb57489b720096ef912f738b46330a8f577803 3.4.0 95m
103+
00-worker 5bdb57489b720096ef912f738b46330a8f577803 3.4.0 95m
104+
01-master-container-runtime 5bdb57489b720096ef912f738b46330a8f577803 3.4.0 95m
105+
01-master-kubelet 5bdb57489b720096ef912f738b46330a8f577803 3.4.0 95m
106+
01-worker-container-runtime 5bdb57489b720096ef912f738b46330a8f577803 3.4.0 95m
107+
01-worker-kubelet 5bdb57489b720096ef912f738b46330a8f577803 3.4.0 95m
108+
99-master-generated-registries 5bdb57489b720096ef912f738b46330a8f577803 3.4.0 95m
109109
99-master-ssh 3.2.0 98m
110-
99-worker-generated-registries 5bdb57489b720096ef912f738b46330a8f577803 3.2.0 95m
110+
99-worker-generated-registries 5bdb57489b720096ef912f738b46330a8f577803 3.4.0 95m
111111
99-worker-ssh 3.2.0 98m
112112
os-layer-custom 10s <1>
113-
rendered-master-15961f1da260f7be141006404d17d39b 5bdb57489b720096ef912f738b46330a8f577803 3.2.0 95m
114-
rendered-worker-5aff604cb1381a4fe07feaf1595a797e 5bdb57489b720096ef912f738b46330a8f577803 3.2.0 95m
115-
rendered-worker-5de4837625b1cbc237de6b22bc0bc873 5bdb57489b720096ef912f738b46330a8f577803 3.2.0 4s <2>
113+
rendered-master-15961f1da260f7be141006404d17d39b 5bdb57489b720096ef912f738b46330a8f577803 3.4.0 95m
114+
rendered-worker-5aff604cb1381a4fe07feaf1595a797e 5bdb57489b720096ef912f738b46330a8f577803 3.4.0 95m
115+
rendered-worker-5de4837625b1cbc237de6b22bc0bc873 5bdb57489b720096ef912f738b46330a8f577803 3.4.0 4s <2>
116116
----
117117
<1> New machine config
118118
<2> New rendered machine config

modules/create-a-containerruntimeconfig-crd.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ $ oc get mc | grep container
5656
[source,terminal]
5757
----
5858
...
59-
01-master-container-runtime b5c5119de007945b6fe6fb215db3b8e2ceb12511 3.2.0 57m
59+
01-master-container-runtime b5c5119de007945b6fe6fb215db3b8e2ceb12511 3.4.0 57m
6060
...
61-
01-worker-container-runtime b5c5119de007945b6fe6fb215db3b8e2ceb12511 3.2.0 57m
61+
01-worker-container-runtime b5c5119de007945b6fe6fb215db3b8e2ceb12511 3.4.0 57m
6262
...
63-
99-worker-generated-containerruntime b5c5119de007945b6fe6fb215db3b8e2ceb12511 3.2.0 26m
64-
99-worker-generated-containerruntime-1 b5c5119de007945b6fe6fb215db3b8e2ceb12511 3.2.0 17m
65-
99-worker-generated-containerruntime-2 b5c5119de007945b6fe6fb215db3b8e2ceb12511 3.2.0 7m26s
63+
99-worker-generated-containerruntime b5c5119de007945b6fe6fb215db3b8e2ceb12511 3.4.0 26m
64+
99-worker-generated-containerruntime-1 b5c5119de007945b6fe6fb215db3b8e2ceb12511 3.4.0 17m
65+
99-worker-generated-containerruntime-2 b5c5119de007945b6fe6fb215db3b8e2ceb12511 3.4.0 7m26s
6666
...
6767
----
6868

@@ -143,7 +143,7 @@ $ oc get machineconfigs | grep containerrun
143143
.Example output
144144
[source,terminal]
145145
----
146-
99-worker-generated-containerruntime 2c9371fbb673b97a6fe8b1c52691999ed3a1bfc2 3.2.0 31s
146+
99-worker-generated-containerruntime 2c9371fbb673b97a6fe8b1c52691999ed3a1bfc2 3.4.0 31s
147147
----
148148

149149
. Monitor the machine config pool until all are shown as ready:

modules/create-a-kubeletconfig-crd-to-edit-kubelet-parameters.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ $ oc get mc | grep kubelet
7070
[source,terminal]
7171
----
7272
...
73-
99-worker-generated-kubelet-1 b5c5119de007945b6fe6fb215db3b8e2ceb12511 3.2.0 26m
73+
99-worker-generated-kubelet-1 b5c5119de007945b6fe6fb215db3b8e2ceb12511 3.4.0 26m
7474
...
7575
----
7676

modules/machine-config-overview.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ a machine config that is injected directly into the {product-title} installer pr
3131
3232
* MCO is only supported for writing to files in `/etc` and `/var` directories, although there are symbolic links to some directories that can be writeable by being symbolically linked to one of those areas. The `/opt` and `/usr/local` directories are examples.
3333
34-
* Ignition is the configuration format used in MachineConfigs. See the link:https://coreos.github.io/ignition/configuration-v3_2/[Ignition Configuration Specification v3.2.0] for details.
34+
* Ignition is the configuration format used in MachineConfigs. See the link:https://coreos.github.io/ignition/configuration-v3_4/[Ignition Configuration Specification v3.4.0] for details.
3535
3636
* Although Ignition config settings can be delivered directly at {product-title} installation time, and are formatted in the same way that MCO delivers Ignition configs, MCO has no way of seeing what those original Ignition configs are. Therefore, you should wrap Ignition config settings into a machine config before deploying them.
3737

modules/nodes-nodes-kernel-arguments.adoc

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,18 @@ $ oc get MachineConfig
6464
[source,terminal]
6565
----
6666
NAME GENERATEDBYCONTROLLER IGNITIONVERSION AGE
67-
00-master 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
68-
00-worker 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
69-
01-master-container-runtime 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
70-
01-master-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
71-
01-worker-container-runtime 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
72-
01-worker-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
73-
99-master-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
67+
00-master 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
68+
00-worker 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
69+
01-master-container-runtime 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
70+
01-master-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
71+
01-worker-container-runtime 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
72+
01-worker-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
73+
99-master-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
7474
99-master-ssh 3.2.0 40m
75-
99-worker-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
75+
99-worker-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
7676
99-worker-ssh 3.2.0 40m
77-
rendered-master-23e785de7587df95a4b517e0647e5ab7 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
78-
rendered-worker-5d596d9293ca3ea80c896a1191735bb1 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
77+
rendered-master-23e785de7587df95a4b517e0647e5ab7 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
78+
rendered-worker-5d596d9293ca3ea80c896a1191735bb1 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
7979
----
8080

8181
ifndef::openshift-origin[]
@@ -119,7 +119,7 @@ metadata:
119119
spec:
120120
config:
121121
ignition:
122-
version: 3.2.0
122+
version: 3.4.0
123123
kernelArguments:
124124
- enforcing=0 <3>
125125
systemd.unified_cgroup_hierarchy=0 <4>
@@ -151,19 +151,19 @@ $ oc get MachineConfig
151151
[source,terminal]
152152
----
153153
NAME GENERATEDBYCONTROLLER IGNITIONVERSION AGE
154-
00-master 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
155-
00-worker 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
156-
01-master-container-runtime 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
157-
01-master-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
158-
01-worker-container-runtime 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
159-
01-worker-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
160-
05-worker-kernelarg-selinuxpermissive 3.2.0 105s
161-
99-master-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
154+
00-master 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
155+
00-worker 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
156+
01-master-container-runtime 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
157+
01-master-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
158+
01-worker-container-runtime 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
159+
01-worker-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
160+
05-worker-kernelarg-selinuxpermissive 3.4.0 105s
161+
99-master-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
162162
99-master-ssh 3.2.0 40m
163-
99-worker-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
163+
99-worker-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
164164
99-worker-ssh 3.2.0 40m
165-
rendered-master-23e785de7587df95a4b517e0647e5ab7 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
166-
rendered-worker-5d596d9293ca3ea80c896a1191735bb1 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
165+
rendered-master-23e785de7587df95a4b517e0647e5ab7 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
166+
rendered-worker-5d596d9293ca3ea80c896a1191735bb1 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
167167
----
168168

169169
. Check the nodes:

modules/rhcos-add-extensions.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ metadata:
3636
spec:
3737
config:
3838
ignition:
39-
version: 3.2.0
39+
version: 3.4.0
4040
extensions:
4141
- usbguard
4242
EOF
@@ -63,7 +63,7 @@ $ oc get machineconfig 80-worker-extensions
6363
[source,terminal]
6464
----
6565
NAME GENERATEDBYCONTROLLER IGNITIONVERSION AGE
66-
80-worker-extensions 3.2.0 57s
66+
80-worker-extensions 3.4.0 57s
6767
----
6868

6969
. Check that the new machine config is now applied and that the nodes are not in a degraded state. It may take a few minutes. The worker pool will show the updates in progress, as each machine successfully has the new machine config applied:

modules/rhcos-enabling-multipath-day-2.adoc

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -84,19 +84,19 @@ $ oc get MachineConfig
8484
[source,terminal]
8585
----
8686
NAME GENERATEDBYCONTROLLER IGNITIONVERSION AGE
87-
00-master 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
88-
00-worker 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
89-
01-master-container-runtime 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
90-
01-master-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
91-
01-worker-container-runtime 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
92-
01-worker-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
93-
99-master-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
87+
00-master 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
88+
00-worker 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
89+
01-master-container-runtime 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
90+
01-master-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
91+
01-worker-container-runtime 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
92+
01-worker-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
93+
99-master-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
9494
99-master-ssh 3.2.0 40m
95-
99-worker-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
96-
99-worker-kargs-mpath 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 105s
95+
99-worker-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
96+
99-worker-kargs-mpath 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 105s
9797
99-worker-ssh 3.2.0 40m
98-
rendered-master-23e785de7587df95a4b517e0647e5ab7 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
99-
rendered-worker-5d596d9293ca3ea80c896a1191735bb1 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
98+
rendered-master-23e785de7587df95a4b517e0647e5ab7 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
99+
rendered-worker-5d596d9293ca3ea80c896a1191735bb1 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
100100
----
101101

102102
. Check the nodes:

0 commit comments

Comments
 (0)