Skip to content

Commit de1c657

Browse files
author
Michael Burke
committed
OCPBUGS39023: Possibly wrong statement in documentation on Ignition version to be used
1 parent dacd948 commit de1c657

12 files changed

+66
-66
lines changed

machine_configuration/machine-configs-configure.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ toc::[]
88

99
You can use the tasks in this section to create `MachineConfig` objects that modify files, systemd unit files, and other operating system features running on {product-title} nodes. For more ideas on working with machine configs, see content related to link:https://access.redhat.com/solutions/3868301[updating] SSH authorized keys, xref:../security/container_security/security-container-signature.adoc#security-container-signature[verifying image signatures], link:https://access.redhat.com/solutions/4727321[enabling SCTP], and link:https://access.redhat.com/solutions/5170251[configuring iSCSI initiatornames] for {product-title}.
1010

11-
{product-title} supports link:https://coreos.github.io/ignition/configuration-v3_2/[Ignition specification version 3.2]. All new machine configs you create going forward should be based on Ignition specification version 3.2. If you are upgrading your {product-title} cluster, any existing Ignition specification version 2.x machine configs will be translated automatically to specification version 3.2.
11+
{product-title} supports link:https://coreos.github.io/ignition/configuration-v3_4/[Ignition specification version 3.4]. You should base all new machine configs you create going forward on Ignition specification version 3.4. If you are upgrading your {product-title} cluster, any existing machine configs with a previous Ignition specification will be translated automatically to specification version 3.4.
1212

1313
There might be situations where the configuration on a node does not fully match what the currently-applied machine config specifies. This state is called _configuration drift_. The Machine Config Daemon (MCD) regularly checks the nodes for configuration drift. If the MCD detects configuration drift, the MCO marks the node `degraded` until an administrator corrects the node configuration. A degraded node is online and operational, but, it cannot be updated. For more information on configuration drift, see xref:../machine_configuration/index.adoc#machine-config-drift-detection_machine-config-overview[Understanding configuration drift detection].
1414

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
@@ -97,20 +97,20 @@ $ oc get mc
9797
[source,terminal]
9898
----
9999
NAME GENERATEDBYCONTROLLER IGNITIONVERSION AGE
100-
00-master 5bdb57489b720096ef912f738b46330a8f577803 3.2.0 95m
101-
00-worker 5bdb57489b720096ef912f738b46330a8f577803 3.2.0 95m
102-
01-master-container-runtime 5bdb57489b720096ef912f738b46330a8f577803 3.2.0 95m
103-
01-master-kubelet 5bdb57489b720096ef912f738b46330a8f577803 3.2.0 95m
104-
01-worker-container-runtime 5bdb57489b720096ef912f738b46330a8f577803 3.2.0 95m
105-
01-worker-kubelet 5bdb57489b720096ef912f738b46330a8f577803 3.2.0 95m
106-
99-master-generated-registries 5bdb57489b720096ef912f738b46330a8f577803 3.2.0 95m
100+
00-master 5bdb57489b720096ef912f738b46330a8f577803 3.4.0 95m
101+
00-worker 5bdb57489b720096ef912f738b46330a8f577803 3.4.0 95m
102+
01-master-container-runtime 5bdb57489b720096ef912f738b46330a8f577803 3.4.0 95m
103+
01-master-kubelet 5bdb57489b720096ef912f738b46330a8f577803 3.4.0 95m
104+
01-worker-container-runtime 5bdb57489b720096ef912f738b46330a8f577803 3.4.0 95m
105+
01-worker-kubelet 5bdb57489b720096ef912f738b46330a8f577803 3.4.0 95m
106+
99-master-generated-registries 5bdb57489b720096ef912f738b46330a8f577803 3.4.0 95m
107107
99-master-ssh 3.2.0 98m
108-
99-worker-generated-registries 5bdb57489b720096ef912f738b46330a8f577803 3.2.0 95m
108+
99-worker-generated-registries 5bdb57489b720096ef912f738b46330a8f577803 3.4.0 95m
109109
99-worker-ssh 3.2.0 98m
110110
os-layer-custom 10s <1>
111-
rendered-master-15961f1da260f7be141006404d17d39b 5bdb57489b720096ef912f738b46330a8f577803 3.2.0 95m
112-
rendered-worker-5aff604cb1381a4fe07feaf1595a797e 5bdb57489b720096ef912f738b46330a8f577803 3.2.0 95m
113-
rendered-worker-5de4837625b1cbc237de6b22bc0bc873 5bdb57489b720096ef912f738b46330a8f577803 3.2.0 4s <2>
111+
rendered-master-15961f1da260f7be141006404d17d39b 5bdb57489b720096ef912f738b46330a8f577803 3.4.0 95m
112+
rendered-worker-5aff604cb1381a4fe07feaf1595a797e 5bdb57489b720096ef912f738b46330a8f577803 3.4.0 95m
113+
rendered-worker-5de4837625b1cbc237de6b22bc0bc873 5bdb57489b720096ef912f738b46330a8f577803 3.4.0 4s <2>
114114
----
115115
<1> New machine config
116116
<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

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

150150
. 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
@@ -74,18 +74,18 @@ $ oc get MachineConfig
7474
[source,terminal]
7575
----
7676
NAME GENERATEDBYCONTROLLER IGNITIONVERSION AGE
77-
00-master 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
78-
00-worker 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
79-
01-master-container-runtime 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
80-
01-master-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
81-
01-worker-container-runtime 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
82-
01-worker-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
83-
99-master-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
77+
00-master 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
78+
00-worker 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
79+
01-master-container-runtime 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
80+
01-master-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
81+
01-worker-container-runtime 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
82+
01-worker-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
83+
99-master-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
8484
99-master-ssh 3.2.0 40m
85-
99-worker-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
85+
99-worker-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
8686
99-worker-ssh 3.2.0 40m
87-
rendered-master-23e785de7587df95a4b517e0647e5ab7 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
88-
rendered-worker-5d596d9293ca3ea80c896a1191735bb1 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
87+
rendered-master-23e785de7587df95a4b517e0647e5ab7 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
88+
rendered-worker-5d596d9293ca3ea80c896a1191735bb1 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
8989
----
9090

9191
ifndef::openshift-origin[]
@@ -129,7 +129,7 @@ metadata:
129129
spec:
130130
config:
131131
ignition:
132-
version: 3.2.0
132+
version: 3.4.0
133133
kernelArguments:
134134
- enforcing=0 <3>
135135
systemd.unified_cgroup_hierarchy=0 <4>
@@ -161,19 +161,19 @@ $ oc get MachineConfig
161161
[source,terminal]
162162
----
163163
NAME GENERATEDBYCONTROLLER IGNITIONVERSION AGE
164-
00-master 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
165-
00-worker 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
166-
01-master-container-runtime 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
167-
01-master-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
168-
01-worker-container-runtime 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
169-
01-worker-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
170-
05-worker-kernelarg-selinuxpermissive 3.2.0 105s
171-
99-master-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
164+
00-master 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
165+
00-worker 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
166+
01-master-container-runtime 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
167+
01-master-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
168+
01-worker-container-runtime 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
169+
01-worker-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
170+
05-worker-kernelarg-selinuxpermissive 3.4.0 105s
171+
99-master-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
172172
99-master-ssh 3.2.0 40m
173-
99-worker-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
173+
99-worker-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
174174
99-worker-ssh 3.2.0 40m
175-
rendered-master-23e785de7587df95a4b517e0647e5ab7 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
176-
rendered-worker-5d596d9293ca3ea80c896a1191735bb1 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m
175+
rendered-master-23e785de7587df95a4b517e0647e5ab7 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
176+
rendered-worker-5d596d9293ca3ea80c896a1191735bb1 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m
177177
----
178178

179179
. Check the nodes:

modules/rhcos-add-extensions.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ metadata:
4747
spec:
4848
config:
4949
ignition:
50-
version: 3.2.0
50+
version: 3.4.0
5151
extensions:
5252
- usbguard
5353
EOF
@@ -74,7 +74,7 @@ $ oc get machineconfig 80-worker-extensions
7474
[source,terminal]
7575
----
7676
NAME GENERATEDBYCONTROLLER IGNITIONVERSION AGE
77-
80-worker-extensions 3.2.0 57s
77+
80-worker-extensions 3.4.0 57s
7878
----
7979

8080
. 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:

0 commit comments

Comments
 (0)