Skip to content

Commit 830ba6b

Browse files
mburke5678mburke5678
authored
Merge pull request #92385 from mburke5678/mco-bump-ignition
OSDOCS14378: Bump ignition to spec 3.5
2 parents dc754ef + b4d7625 commit 830ba6b

21 files changed

+139
-139
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_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.
11+
{product-title} supports link:https://coreos.github.io/ignition/configuration-v3_5/[Ignition specification version 3.5]. You should base all new machine configs you create going forward on Ignition specification version 3.5. 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.5.
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-node-status.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ $ oc get machineconfig
5050
[source,text]
5151
----
5252
# ...
53-
rendered-master-23cf200e4ee97daa6e39fdce24c9fb67 c00e2c941bc6e236b50e0bf3988e6c790cf2bbb2 3.4.0 6d15h
54-
rendered-master-a386c2d1550b927d274054124f58be68 c00e2c941bc6e236b50e0bf3988e6c790cf2bbb2 3.4.0 7m26s
53+
rendered-master-23cf200e4ee97daa6e39fdce24c9fb67 c00e2c941bc6e236b50e0bf3988e6c790cf2bbb2 3.5.0 6d15h
54+
rendered-master-a386c2d1550b927d274054124f58be68 c00e2c941bc6e236b50e0bf3988e6c790cf2bbb2 3.5.0 7m26s
5555
# ...
56-
rendered-worker-01f27f752eb84eba917450e43636b210 c00e2c941bc6e236b50e0bf3988e6c790cf2bbb2 3.4.0 6d15h <1>
57-
rendered-worker-f351f6947f15cd0380514f4b1c89f8f2 c00e2c941bc6e236b50e0bf3988e6c790cf2bbb2 3.4.0 7m26s <2>
56+
rendered-worker-01f27f752eb84eba917450e43636b210 c00e2c941bc6e236b50e0bf3988e6c790cf2bbb2 3.5.0 6d15h <1>
57+
rendered-worker-f351f6947f15cd0380514f4b1c89f8f2 c00e2c941bc6e236b50e0bf3988e6c790cf2bbb2 3.5.0 7m26s <2>
5858
# ...
5959
----
6060
<1> The current machine config for the control plane and worker nodes.

‎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.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
105+
00-master 2c9371fbb673b97a6fe8b1c52... 3.5.0 5h18m
106+
00-worker 2c9371fbb673b97a6fe8b1c52... 3.5.0 5h18m
107+
01-master-container-runtime 2c9371fbb673b97a6fe8b1c52... 3.5.0 5h18m
108+
01-master-kubelet 2c9371fbb673b97a6fe8b1c52… 3.5.0 5h18m
109109
...
110-
rendered-master-dde... 2c9371fbb673b97a6fe8b1c52... 3.4.0 5h18m
111-
rendered-worker-fde... 2c9371fbb673b97a6fe8b1c52... 3.4.0 5h18m
110+
rendered-master-dde... 2c9371fbb673b97a6fe8b1c52... 3.5.0 5h18m
111+
rendered-worker-fde... 2c9371fbb673b97a6fe8b1c52... 3.5.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.4.0
133+
Version: 3.5.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.4.0
33+
version: 3.5.0
3434
systemd:
3535
units:
3636
- contents: |

‎modules/containers-signature-verify-enable.adoc

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -92,24 +92,24 @@ $ oc get mc
9292
[source,terminal]
9393
----
9494
NAME GENERATEDBYCONTROLLER IGNITIONVERSION AGE
95-
00-master a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.2.0 25m
96-
00-worker a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.2.0 25m
97-
01-master-container-runtime a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.2.0 25m
98-
01-master-kubelet a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.2.0 25m
99-
01-worker-container-runtime a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.2.0 25m
100-
01-worker-kubelet a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.2.0 25m
101-
51-master-rh-registry-trust 3.2.0 13s
102-
51-worker-rh-registry-trust 3.2.0 53s <1>
103-
99-master-generated-crio-seccomp-use-default 3.2.0 25m
104-
99-master-generated-registries a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.2.0 25m
95+
00-master a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.5.0 25m
96+
00-worker a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.5.0 25m
97+
01-master-container-runtime a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.5.0 25m
98+
01-master-kubelet a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.5.0 25m
99+
01-worker-container-runtime a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.5.0 25m
100+
01-worker-kubelet a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.5.0 25m
101+
51-master-rh-registry-trust 3.5.0 13s
102+
51-worker-rh-registry-trust 3.5.0 53s <1>
103+
99-master-generated-crio-seccomp-use-default 3.5.0 25m
104+
99-master-generated-registries a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.5.0 25m
105105
99-master-ssh 3.2.0 28m
106-
99-worker-generated-crio-seccomp-use-default 3.2.0 25m
107-
99-worker-generated-registries a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.2.0 25m
106+
99-worker-generated-crio-seccomp-use-default 3.5.0 25m
107+
99-worker-generated-registries a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.5.0 25m
108108
99-worker-ssh 3.2.0 28m
109-
rendered-master-af1e7ff78da0a9c851bab4be2777773b a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.2.0 8s
110-
rendered-master-cd51fd0c47e91812bfef2765c52ec7e6 a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.2.0 24m
111-
rendered-worker-2b52f75684fbc711bd1652dd86fd0b82 a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.2.0 24m
112-
rendered-worker-be3b3bce4f4aa52a62902304bac9da3c a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.2.0 48s <2>
109+
rendered-master-af1e7ff78da0a9c851bab4be2777773b a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.5.0 8s
110+
rendered-master-cd51fd0c47e91812bfef2765c52ec7e6 a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.5.0 24m
111+
rendered-worker-2b52f75684fbc711bd1652dd86fd0b82 a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.5.0 24m
112+
rendered-worker-be3b3bce4f4aa52a62902304bac9da3c a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.5.0 48s <2>
113113
----
114114
<1> New machine config
115115
<2> New rendered machine config

‎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.4.0
48+
version: 3.5.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.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
100+
00-master 5bdb57489b720096ef912f738b46330a8f577803 3.5.0 95m
101+
00-worker 5bdb57489b720096ef912f738b46330a8f577803 3.5.0 95m
102+
01-master-container-runtime 5bdb57489b720096ef912f738b46330a8f577803 3.5.0 95m
103+
01-master-kubelet 5bdb57489b720096ef912f738b46330a8f577803 3.5.0 95m
104+
01-worker-container-runtime 5bdb57489b720096ef912f738b46330a8f577803 3.5.0 95m
105+
01-worker-kubelet 5bdb57489b720096ef912f738b46330a8f577803 3.5.0 95m
106+
99-master-generated-registries 5bdb57489b720096ef912f738b46330a8f577803 3.5.0 95m
107107
99-master-ssh 3.2.0 98m
108-
99-worker-generated-registries 5bdb57489b720096ef912f738b46330a8f577803 3.4.0 95m
108+
99-worker-generated-registries 5bdb57489b720096ef912f738b46330a8f577803 3.5.0 95m
109109
99-worker-ssh 3.2.0 98m
110110
os-layer-custom 10s <1>
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>
111+
rendered-master-15961f1da260f7be141006404d17d39b 5bdb57489b720096ef912f738b46330a8f577803 3.5.0 95m
112+
rendered-worker-5aff604cb1381a4fe07feaf1595a797e 5bdb57489b720096ef912f738b46330a8f577803 3.5.0 95m
113+
rendered-worker-5de4837625b1cbc237de6b22bc0bc873 5bdb57489b720096ef912f738b46330a8f577803 3.5.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.4.0 57m
59+
01-master-container-runtime b5c5119de007945b6fe6fb215db3b8e2ceb12511 3.5.0 57m
6060
...
61-
01-worker-container-runtime b5c5119de007945b6fe6fb215db3b8e2ceb12511 3.4.0 57m
61+
01-worker-container-runtime b5c5119de007945b6fe6fb215db3b8e2ceb12511 3.5.0 57m
6262
...
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
63+
99-worker-generated-containerruntime b5c5119de007945b6fe6fb215db3b8e2ceb12511 3.5.0 26m
64+
99-worker-generated-containerruntime-1 b5c5119de007945b6fe6fb215db3b8e2ceb12511 3.5.0 17m
65+
99-worker-generated-containerruntime-2 b5c5119de007945b6fe6fb215db3b8e2ceb12511 3.5.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.4.0 31s
147+
99-worker-generated-containerruntime 2c9371fbb673b97a6fe8b1c52691999ed3a1bfc2 3.5.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.4.0 26m
73+
99-worker-generated-kubelet-1 b5c5119de007945b6fe6fb215db3b8e2ceb12511 3.5.0 26m
7474
...
7575
----
7676

‎modules/creating-infra-machines.adoc

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -76,29 +76,29 @@ $ oc get machineconfig
7676
[source,terminal]
7777
----
7878
NAME GENERATEDBYCONTROLLER IGNITIONVERSION CREATED
79-
00-master 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.2.0 31d
80-
00-worker 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.2.0 31d
81-
01-master-container-runtime 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.2.0 31d
82-
01-master-kubelet 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.2.0 31d
83-
01-worker-container-runtime 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.2.0 31d
84-
01-worker-kubelet 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.2.0 31d
85-
99-master-1ae2a1e0-a115-11e9-8f14-005056899d54-registries 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.2.0 31d
79+
00-master 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.5.0 31d
80+
00-worker 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.5.0 31d
81+
01-master-container-runtime 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.5.0 31d
82+
01-master-kubelet 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.5.0 31d
83+
01-worker-container-runtime 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.5.0 31d
84+
01-worker-kubelet 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.5.0 31d
85+
99-master-1ae2a1e0-a115-11e9-8f14-005056899d54-registries 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.5.0 31d
8686
99-master-ssh 3.2.0 31d
87-
99-worker-1ae64748-a115-11e9-8f14-005056899d54-registries 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.2.0 31d
87+
99-worker-1ae64748-a115-11e9-8f14-005056899d54-registries 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.5.0 31d
8888
99-worker-ssh 3.2.0 31d
89-
rendered-infra-4e48906dca84ee702959c71a53ee80e7 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.2.0 23m
90-
rendered-master-072d4b2da7f88162636902b074e9e28e 5b6fb8349a29735e48446d435962dec4547d3090 3.2.0 31d
91-
rendered-master-3e88ec72aed3886dec061df60d16d1af 02c07496ba0417b3e12b78fb32baf6293d314f79 3.2.0 31d
92-
rendered-master-419bee7de96134963a15fdf9dd473b25 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.2.0 17d
93-
rendered-master-53f5c91c7661708adce18739cc0f40fb 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.2.0 13d
94-
rendered-master-a6a357ec18e5bce7f5ac426fc7c5ffcd 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.2.0 7d3h
95-
rendered-master-dc7f874ec77fc4b969674204332da037 5b6fb8349a29735e48446d435962dec4547d3090 3.2.0 31d
96-
rendered-worker-1a75960c52ad18ff5dfa6674eb7e533d 5b6fb8349a29735e48446d435962dec4547d3090 3.2.0 31d
97-
rendered-worker-2640531be11ba43c61d72e82dc634ce6 5b6fb8349a29735e48446d435962dec4547d3090 3.2.0 31d
98-
rendered-worker-4e48906dca84ee702959c71a53ee80e7 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.2.0 7d3h
99-
rendered-worker-4f110718fe88e5f349987854a1147755 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.2.0 17d
100-
rendered-worker-afc758e194d6188677eb837842d3b379 02c07496ba0417b3e12b78fb32baf6293d314f79 3.2.0 31d
101-
rendered-worker-daa08cc1e8f5fcdeba24de60cd955cc3 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.2.0 13d
89+
rendered-infra-4e48906dca84ee702959c71a53ee80e7 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.5.0 23m
90+
rendered-master-072d4b2da7f88162636902b074e9e28e 5b6fb8349a29735e48446d435962dec4547d3090 3.5.0 31d
91+
rendered-master-3e88ec72aed3886dec061df60d16d1af 02c07496ba0417b3e12b78fb32baf6293d314f79 3.5.0 31d
92+
rendered-master-419bee7de96134963a15fdf9dd473b25 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.5.0 17d
93+
rendered-master-53f5c91c7661708adce18739cc0f40fb 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.5.0 13d
94+
rendered-master-a6a357ec18e5bce7f5ac426fc7c5ffcd 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.5.0 7d3h
95+
rendered-master-dc7f874ec77fc4b969674204332da037 5b6fb8349a29735e48446d435962dec4547d3090 3.5.0 31d
96+
rendered-worker-1a75960c52ad18ff5dfa6674eb7e533d 5b6fb8349a29735e48446d435962dec4547d3090 3.5.0 31d
97+
rendered-worker-2640531be11ba43c61d72e82dc634ce6 5b6fb8349a29735e48446d435962dec4547d3090 3.5.0 31d
98+
rendered-worker-4e48906dca84ee702959c71a53ee80e7 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.5.0 7d3h
99+
rendered-worker-4f110718fe88e5f349987854a1147755 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.5.0 17d
100+
rendered-worker-afc758e194d6188677eb837842d3b379 02c07496ba0417b3e12b78fb32baf6293d314f79 3.5.0 31d
101+
rendered-worker-daa08cc1e8f5fcdeba24de60cd955cc3 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.5.0 13d
102102
----
103103
+
104104
You should see a new machine config, with the `rendered-infra-*` prefix.
@@ -129,7 +129,7 @@ metadata:
129129
spec:
130130
config:
131131
ignition:
132-
version: 3.2.0
132+
version: 3.5.0
133133
storage:
134134
files:
135135
- path: /etc/infratest

0 commit comments

Comments
 (0)