From 1d7a19f8f1cde95b4a8c91115886d9b52b00da97 Mon Sep 17 00:00:00 2001 From: Michael Burke Date: Fri, 18 Apr 2025 17:14:23 -0400 Subject: [PATCH] OSDOCS14378: Bump ignition to spec 3.5 --- .../machine-configs-configure.adoc | 2 +- modules/checking-mco-node-status.adoc | 8 ++-- modules/checking-mco-status.adoc | 14 +++--- modules/cnf-disable-chronyd.adoc | 2 +- .../containers-signature-verify-enable.adoc | 36 +++++++------- modules/core-user-password.adoc | 2 +- modules/coreos-layering-configuring.adoc | 26 +++++----- .../create-a-containerruntimeconfig-crd.adoc | 12 ++--- ...config-crd-to-edit-kubelet-parameters.adoc | 2 +- modules/creating-infra-machines.adoc | 48 +++++++++---------- modules/digging-into-machine-config.adoc | 12 ++--- ...nstallation-osp-local-disk-deployment.adoc | 2 +- modules/machine-config-overview.adoc | 2 +- modules/move-etcd-different-disk.adoc | 2 +- modules/nodes-clusters-cgroups-2.adoc | 28 +++++------ modules/nodes-nodes-kernel-arguments.adoc | 44 ++++++++--------- modules/rhcos-add-extensions.adoc | 4 +- modules/rhcos-enabling-multipath-day-2.adoc | 22 ++++----- ...-partition-size-for-overlay-with-crio.adoc | 4 +- modules/virt-binding-devices-vfio-driver.adoc | 16 +++---- ...-configure-higher-vm-workload-density.adoc | 2 +- 21 files changed, 145 insertions(+), 145 deletions(-) diff --git a/machine_configuration/machine-configs-configure.adoc b/machine_configuration/machine-configs-configure.adoc index 173b709942c5..c2d672ef81be 100644 --- a/machine_configuration/machine-configs-configure.adoc +++ b/machine_configuration/machine-configs-configure.adoc @@ -8,7 +8,7 @@ toc::[] 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}. -{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. +{product-title} supports link:https://coreos.github.io/ignition/configuration-v3_5/[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. 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]. diff --git a/modules/checking-mco-node-status.adoc b/modules/checking-mco-node-status.adoc index c76c6e4635b7..a41ecb8be400 100644 --- a/modules/checking-mco-node-status.adoc +++ b/modules/checking-mco-node-status.adoc @@ -50,11 +50,11 @@ $ oc get machineconfig [source,text] ---- # ... -rendered-master-23cf200e4ee97daa6e39fdce24c9fb67 c00e2c941bc6e236b50e0bf3988e6c790cf2bbb2 3.4.0 6d15h -rendered-master-a386c2d1550b927d274054124f58be68 c00e2c941bc6e236b50e0bf3988e6c790cf2bbb2 3.4.0 7m26s +rendered-master-23cf200e4ee97daa6e39fdce24c9fb67 c00e2c941bc6e236b50e0bf3988e6c790cf2bbb2 3.5.0 6d15h +rendered-master-a386c2d1550b927d274054124f58be68 c00e2c941bc6e236b50e0bf3988e6c790cf2bbb2 3.5.0 7m26s # ... -rendered-worker-01f27f752eb84eba917450e43636b210 c00e2c941bc6e236b50e0bf3988e6c790cf2bbb2 3.4.0 6d15h <1> -rendered-worker-f351f6947f15cd0380514f4b1c89f8f2 c00e2c941bc6e236b50e0bf3988e6c790cf2bbb2 3.4.0 7m26s <2> +rendered-worker-01f27f752eb84eba917450e43636b210 c00e2c941bc6e236b50e0bf3988e6c790cf2bbb2 3.5.0 6d15h <1> +rendered-worker-f351f6947f15cd0380514f4b1c89f8f2 c00e2c941bc6e236b50e0bf3988e6c790cf2bbb2 3.5.0 7m26s <2> # ... ---- <1> The current machine config for the control plane and worker nodes. diff --git a/modules/checking-mco-status.adoc b/modules/checking-mco-status.adoc index cc749e9cbc2c..a1a0ba2c903d 100644 --- a/modules/checking-mco-status.adoc +++ b/modules/checking-mco-status.adoc @@ -102,13 +102,13 @@ $ oc get machineconfigs [source,terminal] ---- NAME GENERATEDBYCONTROLLER IGNITIONVERSION AGE -00-master 2c9371fbb673b97a6fe8b1c52... 3.4.0 5h18m -00-worker 2c9371fbb673b97a6fe8b1c52... 3.4.0 5h18m -01-master-container-runtime 2c9371fbb673b97a6fe8b1c52... 3.4.0 5h18m -01-master-kubelet 2c9371fbb673b97a6fe8b1c52… 3.4.0 5h18m +00-master 2c9371fbb673b97a6fe8b1c52... 3.5.0 5h18m +00-worker 2c9371fbb673b97a6fe8b1c52... 3.5.0 5h18m +01-master-container-runtime 2c9371fbb673b97a6fe8b1c52... 3.5.0 5h18m +01-master-kubelet 2c9371fbb673b97a6fe8b1c52… 3.5.0 5h18m ... -rendered-master-dde... 2c9371fbb673b97a6fe8b1c52... 3.4.0 5h18m -rendered-worker-fde... 2c9371fbb673b97a6fe8b1c52... 3.4.0 5h18m +rendered-master-dde... 2c9371fbb673b97a6fe8b1c52... 3.5.0 5h18m +rendered-worker-fde... 2c9371fbb673b97a6fe8b1c52... 3.5.0 5h18m ---- + Note that the `MachineConfig` objects listed as `rendered` are not meant to be changed or deleted. @@ -130,7 +130,7 @@ Name: 01-master-kubelet Spec: Config: Ignition: - Version: 3.4.0 + Version: 3.5.0 Storage: Files: Contents: diff --git a/modules/cnf-disable-chronyd.adoc b/modules/cnf-disable-chronyd.adoc index 4aa68f0ab3b3..9f296d080b0b 100644 --- a/modules/cnf-disable-chronyd.adoc +++ b/modules/cnf-disable-chronyd.adoc @@ -30,7 +30,7 @@ metadata: spec: config: ignition: - version: 3.4.0 + version: 3.5.0 systemd: units: - contents: | diff --git a/modules/containers-signature-verify-enable.adoc b/modules/containers-signature-verify-enable.adoc index ed82f699d6cb..0b8827863b9f 100644 --- a/modules/containers-signature-verify-enable.adoc +++ b/modules/containers-signature-verify-enable.adoc @@ -92,24 +92,24 @@ $ oc get mc [source,terminal] ---- NAME GENERATEDBYCONTROLLER IGNITIONVERSION AGE -00-master a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.2.0 25m -00-worker a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.2.0 25m -01-master-container-runtime a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.2.0 25m -01-master-kubelet a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.2.0 25m -01-worker-container-runtime a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.2.0 25m -01-worker-kubelet a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.2.0 25m -51-master-rh-registry-trust 3.2.0 13s -51-worker-rh-registry-trust 3.2.0 53s <1> -99-master-generated-crio-seccomp-use-default 3.2.0 25m -99-master-generated-registries a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.2.0 25m -99-master-ssh 3.2.0 28m -99-worker-generated-crio-seccomp-use-default 3.2.0 25m -99-worker-generated-registries a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.2.0 25m -99-worker-ssh 3.2.0 28m -rendered-master-af1e7ff78da0a9c851bab4be2777773b a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.2.0 8s -rendered-master-cd51fd0c47e91812bfef2765c52ec7e6 a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.2.0 24m -rendered-worker-2b52f75684fbc711bd1652dd86fd0b82 a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.2.0 24m -rendered-worker-be3b3bce4f4aa52a62902304bac9da3c a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.2.0 48s <2> +00-master a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.5.0 25m +00-worker a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.5.0 25m +01-master-container-runtime a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.5.0 25m +01-master-kubelet a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.5.0 25m +01-worker-container-runtime a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.5.0 25m +01-worker-kubelet a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.5.0 25m +51-master-rh-registry-trust 3.5.0 13s +51-worker-rh-registry-trust 3.5.0 53s <1> +99-master-generated-crio-seccomp-use-default 3.5.0 25m +99-master-generated-registries a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.5.0 25m +99-master-ssh 3.4.0 28m +99-worker-generated-crio-seccomp-use-default 3.5.0 25m +99-worker-generated-registries a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.5.0 25m +99-worker-ssh 3.4.0 28m +rendered-master-af1e7ff78da0a9c851bab4be2777773b a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.5.0 8s +rendered-master-cd51fd0c47e91812bfef2765c52ec7e6 a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.5.0 24m +rendered-worker-2b52f75684fbc711bd1652dd86fd0b82 a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.5.0 24m +rendered-worker-be3b3bce4f4aa52a62902304bac9da3c a2178ad522c49ee330b0033bb5cb5ea132060b0a 3.5.0 48s <2> ---- <1> New machine config <2> New rendered machine config diff --git a/modules/core-user-password.adoc b/modules/core-user-password.adoc index aa8e498c4409..a1d65f54b1dd 100644 --- a/modules/core-user-password.adoc +++ b/modules/core-user-password.adoc @@ -45,7 +45,7 @@ metadata: spec: config: ignition: - version: 3.4.0 + version: 3.5.0 passwd: users: - name: core <1> diff --git a/modules/coreos-layering-configuring.adoc b/modules/coreos-layering-configuring.adoc index 1406ca9448aa..7ea3cd7a899f 100644 --- a/modules/coreos-layering-configuring.adoc +++ b/modules/coreos-layering-configuring.adoc @@ -97,20 +97,20 @@ $ oc get mc [source,terminal] ---- NAME GENERATEDBYCONTROLLER IGNITIONVERSION AGE -00-master 5bdb57489b720096ef912f738b46330a8f577803 3.4.0 95m -00-worker 5bdb57489b720096ef912f738b46330a8f577803 3.4.0 95m -01-master-container-runtime 5bdb57489b720096ef912f738b46330a8f577803 3.4.0 95m -01-master-kubelet 5bdb57489b720096ef912f738b46330a8f577803 3.4.0 95m -01-worker-container-runtime 5bdb57489b720096ef912f738b46330a8f577803 3.4.0 95m -01-worker-kubelet 5bdb57489b720096ef912f738b46330a8f577803 3.4.0 95m -99-master-generated-registries 5bdb57489b720096ef912f738b46330a8f577803 3.4.0 95m -99-master-ssh 3.2.0 98m -99-worker-generated-registries 5bdb57489b720096ef912f738b46330a8f577803 3.4.0 95m -99-worker-ssh 3.2.0 98m +00-master 5bdb57489b720096ef912f738b46330a8f577803 3.5.0 95m +00-worker 5bdb57489b720096ef912f738b46330a8f577803 3.5.0 95m +01-master-container-runtime 5bdb57489b720096ef912f738b46330a8f577803 3.5.0 95m +01-master-kubelet 5bdb57489b720096ef912f738b46330a8f577803 3.5.0 95m +01-worker-container-runtime 5bdb57489b720096ef912f738b46330a8f577803 3.5.0 95m +01-worker-kubelet 5bdb57489b720096ef912f738b46330a8f577803 3.5.0 95m +99-master-generated-registries 5bdb57489b720096ef912f738b46330a8f577803 3.5.0 95m +99-master-ssh 3.4.0 98m +99-worker-generated-registries 5bdb57489b720096ef912f738b46330a8f577803 3.5.0 95m +99-worker-ssh 3.4.0 98m os-layer-custom 10s <1> -rendered-master-15961f1da260f7be141006404d17d39b 5bdb57489b720096ef912f738b46330a8f577803 3.4.0 95m -rendered-worker-5aff604cb1381a4fe07feaf1595a797e 5bdb57489b720096ef912f738b46330a8f577803 3.4.0 95m -rendered-worker-5de4837625b1cbc237de6b22bc0bc873 5bdb57489b720096ef912f738b46330a8f577803 3.4.0 4s <2> +rendered-master-15961f1da260f7be141006404d17d39b 5bdb57489b720096ef912f738b46330a8f577803 3.5.0 95m +rendered-worker-5aff604cb1381a4fe07feaf1595a797e 5bdb57489b720096ef912f738b46330a8f577803 3.5.0 95m +rendered-worker-5de4837625b1cbc237de6b22bc0bc873 5bdb57489b720096ef912f738b46330a8f577803 3.5.0 4s <2> ---- <1> New machine config <2> New rendered machine config diff --git a/modules/create-a-containerruntimeconfig-crd.adoc b/modules/create-a-containerruntimeconfig-crd.adoc index 640ff1552eeb..9134043f45de 100644 --- a/modules/create-a-containerruntimeconfig-crd.adoc +++ b/modules/create-a-containerruntimeconfig-crd.adoc @@ -56,13 +56,13 @@ $ oc get mc | grep container [source,terminal] ---- ... -01-master-container-runtime b5c5119de007945b6fe6fb215db3b8e2ceb12511 3.4.0 57m +01-master-container-runtime b5c5119de007945b6fe6fb215db3b8e2ceb12511 3.5.0 57m ... -01-worker-container-runtime b5c5119de007945b6fe6fb215db3b8e2ceb12511 3.4.0 57m +01-worker-container-runtime b5c5119de007945b6fe6fb215db3b8e2ceb12511 3.5.0 57m ... -99-worker-generated-containerruntime b5c5119de007945b6fe6fb215db3b8e2ceb12511 3.4.0 26m -99-worker-generated-containerruntime-1 b5c5119de007945b6fe6fb215db3b8e2ceb12511 3.4.0 17m -99-worker-generated-containerruntime-2 b5c5119de007945b6fe6fb215db3b8e2ceb12511 3.4.0 7m26s +99-worker-generated-containerruntime b5c5119de007945b6fe6fb215db3b8e2ceb12511 3.5.0 26m +99-worker-generated-containerruntime-1 b5c5119de007945b6fe6fb215db3b8e2ceb12511 3.5.0 17m +99-worker-generated-containerruntime-2 b5c5119de007945b6fe6fb215db3b8e2ceb12511 3.5.0 7m26s ... ---- @@ -144,7 +144,7 @@ $ oc get machineconfigs | grep containerrun .Example output [source,terminal] ---- -99-worker-generated-containerruntime 2c9371fbb673b97a6fe8b1c52691999ed3a1bfc2 3.4.0 31s +99-worker-generated-containerruntime 2c9371fbb673b97a6fe8b1c52691999ed3a1bfc2 3.5.0 31s ---- . Monitor the machine config pool until all are shown as ready: diff --git a/modules/create-a-kubeletconfig-crd-to-edit-kubelet-parameters.adoc b/modules/create-a-kubeletconfig-crd-to-edit-kubelet-parameters.adoc index 6d8181bee2ee..b9f1a1d143d9 100644 --- a/modules/create-a-kubeletconfig-crd-to-edit-kubelet-parameters.adoc +++ b/modules/create-a-kubeletconfig-crd-to-edit-kubelet-parameters.adoc @@ -70,7 +70,7 @@ $ oc get mc | grep kubelet [source,terminal] ---- ... -99-worker-generated-kubelet-1 b5c5119de007945b6fe6fb215db3b8e2ceb12511 3.4.0 26m +99-worker-generated-kubelet-1 b5c5119de007945b6fe6fb215db3b8e2ceb12511 3.5.0 26m ... ---- diff --git a/modules/creating-infra-machines.adoc b/modules/creating-infra-machines.adoc index 52ad16ada07b..71ddc10fcc6a 100644 --- a/modules/creating-infra-machines.adoc +++ b/modules/creating-infra-machines.adoc @@ -76,29 +76,29 @@ $ oc get machineconfig [source,terminal] ---- NAME GENERATEDBYCONTROLLER IGNITIONVERSION CREATED -00-master 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.2.0 31d -00-worker 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.2.0 31d -01-master-container-runtime 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.2.0 31d -01-master-kubelet 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.2.0 31d -01-worker-container-runtime 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.2.0 31d -01-worker-kubelet 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.2.0 31d -99-master-1ae2a1e0-a115-11e9-8f14-005056899d54-registries 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.2.0 31d -99-master-ssh 3.2.0 31d -99-worker-1ae64748-a115-11e9-8f14-005056899d54-registries 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.2.0 31d -99-worker-ssh 3.2.0 31d -rendered-infra-4e48906dca84ee702959c71a53ee80e7 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.2.0 23m -rendered-master-072d4b2da7f88162636902b074e9e28e 5b6fb8349a29735e48446d435962dec4547d3090 3.2.0 31d -rendered-master-3e88ec72aed3886dec061df60d16d1af 02c07496ba0417b3e12b78fb32baf6293d314f79 3.2.0 31d -rendered-master-419bee7de96134963a15fdf9dd473b25 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.2.0 17d -rendered-master-53f5c91c7661708adce18739cc0f40fb 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.2.0 13d -rendered-master-a6a357ec18e5bce7f5ac426fc7c5ffcd 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.2.0 7d3h -rendered-master-dc7f874ec77fc4b969674204332da037 5b6fb8349a29735e48446d435962dec4547d3090 3.2.0 31d -rendered-worker-1a75960c52ad18ff5dfa6674eb7e533d 5b6fb8349a29735e48446d435962dec4547d3090 3.2.0 31d -rendered-worker-2640531be11ba43c61d72e82dc634ce6 5b6fb8349a29735e48446d435962dec4547d3090 3.2.0 31d -rendered-worker-4e48906dca84ee702959c71a53ee80e7 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.2.0 7d3h -rendered-worker-4f110718fe88e5f349987854a1147755 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.2.0 17d -rendered-worker-afc758e194d6188677eb837842d3b379 02c07496ba0417b3e12b78fb32baf6293d314f79 3.2.0 31d -rendered-worker-daa08cc1e8f5fcdeba24de60cd955cc3 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.2.0 13d +00-master 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.5.0 31d +00-worker 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.5.0 31d +01-master-container-runtime 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.5.0 31d +01-master-kubelet 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.5.0 31d +01-worker-container-runtime 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.5.0 31d +01-worker-kubelet 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.5.0 31d +99-master-1ae2a1e0-a115-11e9-8f14-005056899d54-registries 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.5.0 31d +99-master-ssh 3.4.0 31d +99-worker-1ae64748-a115-11e9-8f14-005056899d54-registries 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.5.0 31d +99-worker-ssh 3.4.0 31d +rendered-infra-4e48906dca84ee702959c71a53ee80e7 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.5.0 23m +rendered-master-072d4b2da7f88162636902b074e9e28e 5b6fb8349a29735e48446d435962dec4547d3090 3.5.0 31d +rendered-master-3e88ec72aed3886dec061df60d16d1af 02c07496ba0417b3e12b78fb32baf6293d314f79 3.5.0 31d +rendered-master-419bee7de96134963a15fdf9dd473b25 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.5.0 17d +rendered-master-53f5c91c7661708adce18739cc0f40fb 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.5.0 13d +rendered-master-a6a357ec18e5bce7f5ac426fc7c5ffcd 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.5.0 7d3h +rendered-master-dc7f874ec77fc4b969674204332da037 5b6fb8349a29735e48446d435962dec4547d3090 3.5.0 31d +rendered-worker-1a75960c52ad18ff5dfa6674eb7e533d 5b6fb8349a29735e48446d435962dec4547d3090 3.5.0 31d +rendered-worker-2640531be11ba43c61d72e82dc634ce6 5b6fb8349a29735e48446d435962dec4547d3090 3.5.0 31d +rendered-worker-4e48906dca84ee702959c71a53ee80e7 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.5.0 7d3h +rendered-worker-4f110718fe88e5f349987854a1147755 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.5.0 17d +rendered-worker-afc758e194d6188677eb837842d3b379 02c07496ba0417b3e12b78fb32baf6293d314f79 3.5.0 31d +rendered-worker-daa08cc1e8f5fcdeba24de60cd955cc3 365c1cfd14de5b0e3b85e0fc815b0060f36ab955 3.5.0 13d ---- + You should see a new machine config, with the `rendered-infra-*` prefix. @@ -129,7 +129,7 @@ metadata: spec: config: ignition: - version: 3.2.0 + version: 3.5.0 storage: files: - path: /etc/infratest diff --git a/modules/digging-into-machine-config.adoc b/modules/digging-into-machine-config.adoc index 7daead328690..51873a62a529 100644 --- a/modules/digging-into-machine-config.adoc +++ b/modules/digging-into-machine-config.adoc @@ -34,14 +34,14 @@ $ oc get machineconfig ---- NAME                                      GENERATEDBYCONTROLLER   IGNITIONVERSION   CREATED   OSIMAGEURL -00-master                                 4.0.0-0.150.0.0-dirty   3.2.0             16m +00-master                                 4.0.0-0.150.0.0-dirty   3.5.0             16m 00-master-ssh                             4.0.0-0.150.0.0-dirty                     16m -00-worker                                 4.0.0-0.150.0.0-dirty   3.2.0             16m +00-worker                                 4.0.0-0.150.0.0-dirty   3.5.0             16m 00-worker-ssh                             4.0.0-0.150.0.0-dirty                     16m -01-master-kubelet                         4.0.0-0.150.0.0-dirty   3.2.0             16m -01-worker-kubelet                         4.0.0-0.150.0.0-dirty   3.2.0             16m -master-1638c1aea398413bb918e76632f20799   4.0.0-0.150.0.0-dirty   3.2.0             16m -worker-2feef4f8288936489a5a832ca8efe953   4.0.0-0.150.0.0-dirty   3.2.0             16m +01-master-kubelet                         4.0.0-0.150.0.0-dirty   3.5.0             16m +01-worker-kubelet                         4.0.0-0.150.0.0-dirty   3.5.0             16m +master-1638c1aea398413bb918e76632f20799   4.0.0-0.150.0.0-dirty   3.5.0             16m +worker-2feef4f8288936489a5a832ca8efe953   4.0.0-0.150.0.0-dirty   3.5.0             16m ---- The Machine Config Operator acts somewhat differently than Ignition when it diff --git a/modules/installation-osp-local-disk-deployment.adoc b/modules/installation-osp-local-disk-deployment.adoc index 8cf86fb5d879..ccfda776b17a 100644 --- a/modules/installation-osp-local-disk-deployment.adoc +++ b/modules/installation-osp-local-disk-deployment.adoc @@ -80,7 +80,7 @@ metadata: spec: config: ignition: - version: 3.4.0 + version: 3.5.0 systemd: units: - contents: | diff --git a/modules/machine-config-overview.adoc b/modules/machine-config-overview.adoc index 84e8df15a7af..33bf676308d1 100644 --- a/modules/machine-config-overview.adoc +++ b/modules/machine-config-overview.adoc @@ -31,7 +31,7 @@ a machine config that is injected directly into the {product-title} installer pr * 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. -* 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. +* Ignition is the configuration format used in MachineConfigs. See the link:https://coreos.github.io/ignition/configuration-v3_5/[Ignition Configuration Specification v3.5.0] for details. * 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. diff --git a/modules/move-etcd-different-disk.adoc b/modules/move-etcd-different-disk.adoc index 7ee3a888c03c..a5befce96d6e 100644 --- a/modules/move-etcd-different-disk.adoc +++ b/modules/move-etcd-different-disk.adoc @@ -100,7 +100,7 @@ metadata: spec: config: ignition: - version: 3.4.0 + version: 3.5.0 storage: files: - path: /etc/find-secondary-device diff --git a/modules/nodes-clusters-cgroups-2.adoc b/modules/nodes-clusters-cgroups-2.adoc index 90ef2c8c81c9..d33a564397f0 100644 --- a/modules/nodes-clusters-cgroups-2.adoc +++ b/modules/nodes-clusters-cgroups-2.adoc @@ -128,22 +128,22 @@ $ oc get mc [source,terminal] ---- NAME GENERATEDBYCONTROLLER IGNITIONVERSION AGE -00-master 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m -00-worker 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m -01-master-container-runtime 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m -01-master-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m -01-worker-container-runtime 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m -01-worker-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m -97-master-generated-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m -99-worker-generated-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m -99-master-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m +00-master 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m +00-worker 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m +01-master-container-runtime 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m +01-master-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m +01-worker-container-runtime 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m +01-worker-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m +97-master-generated-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m +99-worker-generated-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m +99-master-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m 99-master-ssh 3.2.0 40m -99-worker-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m +99-worker-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m 99-worker-ssh 3.2.0 40m -rendered-master-23d4317815a5f854bd3553d689cfe2e9 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 10s <1> -rendered-master-23e785de7587df95a4b517e0647e5ab7 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m -rendered-worker-5d596d9293ca3ea80c896a1191735bb1 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m -rendered-worker-dcc7f1b92892d34db74d6832bcc9ccd4 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 10s +rendered-master-23d4317815a5f854bd3553d689cfe2e9 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 10s <1> +rendered-master-23e785de7587df95a4b517e0647e5ab7 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m +rendered-worker-5d596d9293ca3ea80c896a1191735bb1 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m +rendered-worker-dcc7f1b92892d34db74d6832bcc9ccd4 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 10s ---- <1> New machine configs are created, as expected. diff --git a/modules/nodes-nodes-kernel-arguments.adoc b/modules/nodes-nodes-kernel-arguments.adoc index 52199d130546..66bb004848e3 100644 --- a/modules/nodes-nodes-kernel-arguments.adoc +++ b/modules/nodes-nodes-kernel-arguments.adoc @@ -74,18 +74,18 @@ $ oc get MachineConfig [source,terminal] ---- NAME GENERATEDBYCONTROLLER IGNITIONVERSION AGE -00-master 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m -00-worker 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m -01-master-container-runtime 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m -01-master-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m -01-worker-container-runtime 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m -01-worker-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m -99-master-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m +00-master 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m +00-worker 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m +01-master-container-runtime 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m +01-master-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m +01-worker-container-runtime 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m +01-worker-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m +99-master-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m 99-master-ssh 3.2.0 40m -99-worker-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m +99-worker-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m 99-worker-ssh 3.2.0 40m -rendered-master-23e785de7587df95a4b517e0647e5ab7 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m -rendered-worker-5d596d9293ca3ea80c896a1191735bb1 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m +rendered-master-23e785de7587df95a4b517e0647e5ab7 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m +rendered-worker-5d596d9293ca3ea80c896a1191735bb1 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m ---- ifndef::openshift-origin[] @@ -129,7 +129,7 @@ metadata: spec: config: ignition: - version: 3.4.0 + version: 3.5.0 kernelArguments: - enforcing=0 <3> systemd.unified_cgroup_hierarchy=0 <4> @@ -161,19 +161,19 @@ $ oc get MachineConfig [source,terminal] ---- NAME GENERATEDBYCONTROLLER IGNITIONVERSION AGE -00-master 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m -00-worker 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m -01-master-container-runtime 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m -01-master-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m -01-worker-container-runtime 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m -01-worker-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m -05-worker-kernelarg-selinuxpermissive 3.4.0 105s -99-master-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m +00-master 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m +00-worker 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m +01-master-container-runtime 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m +01-master-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m +01-worker-container-runtime 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m +01-worker-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m +05-worker-kernelarg-selinuxpermissive 3.5.0 105s +99-master-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m 99-master-ssh 3.2.0 40m -99-worker-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m +99-worker-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m 99-worker-ssh 3.2.0 40m -rendered-master-23e785de7587df95a4b517e0647e5ab7 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m -rendered-worker-5d596d9293ca3ea80c896a1191735bb1 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m +rendered-master-23e785de7587df95a4b517e0647e5ab7 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m +rendered-worker-5d596d9293ca3ea80c896a1191735bb1 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m ---- . Check the nodes: diff --git a/modules/rhcos-add-extensions.adoc b/modules/rhcos-add-extensions.adoc index e060e1841dc9..440bd8da1c74 100644 --- a/modules/rhcos-add-extensions.adoc +++ b/modules/rhcos-add-extensions.adoc @@ -47,7 +47,7 @@ metadata: spec: config: ignition: - version: 3.4.0 + version: 3.5.0 extensions: - usbguard EOF @@ -74,7 +74,7 @@ $ oc get machineconfig 80-worker-extensions [source,terminal] ---- NAME GENERATEDBYCONTROLLER IGNITIONVERSION AGE -80-worker-extensions 3.4.0 57s +80-worker-extensions 3.5.0 57s ---- . 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: diff --git a/modules/rhcos-enabling-multipath-day-2.adoc b/modules/rhcos-enabling-multipath-day-2.adoc index 9d0f4b395d74..d001d3204766 100644 --- a/modules/rhcos-enabling-multipath-day-2.adoc +++ b/modules/rhcos-enabling-multipath-day-2.adoc @@ -85,19 +85,19 @@ $ oc get MachineConfig [source,terminal] ---- NAME GENERATEDBYCONTROLLER IGNITIONVERSION AGE -00-master 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m -00-worker 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m -01-master-container-runtime 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m -01-master-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m -01-worker-container-runtime 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m -01-worker-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m -99-master-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m +00-master 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m +00-worker 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m +01-master-container-runtime 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m +01-master-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m +01-worker-container-runtime 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m +01-worker-kubelet 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m +99-master-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m 99-master-ssh 3.2.0 40m -99-worker-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m -99-worker-kargs-mpath 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 105s +99-worker-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m +99-worker-kargs-mpath 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 105s 99-worker-ssh 3.2.0 40m -rendered-master-23e785de7587df95a4b517e0647e5ab7 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m -rendered-worker-5d596d9293ca3ea80c896a1191735bb1 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m +rendered-master-23e785de7587df95a4b517e0647e5ab7 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m +rendered-worker-5d596d9293ca3ea80c896a1191735bb1 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.5.0 33m ---- . Check the nodes: diff --git a/modules/set-the-default-max-container-root-partition-size-for-overlay-with-crio.adoc b/modules/set-the-default-max-container-root-partition-size-for-overlay-with-crio.adoc index 6c675473c2dc..8087143936c3 100644 --- a/modules/set-the-default-max-container-root-partition-size-for-overlay-with-crio.adoc +++ b/modules/set-the-default-max-container-root-partition-size-for-overlay-with-crio.adoc @@ -67,8 +67,8 @@ New `99-worker-generated-containerruntime` and `rendered-worker-xyz` objects are .Example output [source,terminal] ---- -99-worker-generated-containerruntime 4173030d89fbf4a7a0976d1665491a4d9a6e54f1 3.4.0 7m42s -rendered-worker-xyz 4173030d89fbf4a7a0976d1665491a4d9a6e54f1 3.4.0 7m36s +99-worker-generated-containerruntime 4173030d89fbf4a7a0976d1665491a4d9a6e54f1 3.5.0 7m42s +rendered-worker-xyz 4173030d89fbf4a7a0976d1665491a4d9a6e54f1 3.5.0 7m36s ---- . After those objects are created, monitor the machine config pool for the changes to be applied: diff --git a/modules/virt-binding-devices-vfio-driver.adoc b/modules/virt-binding-devices-vfio-driver.adoc index dcd413492128..7e860e8382a0 100644 --- a/modules/virt-binding-devices-vfio-driver.adoc +++ b/modules/virt-binding-devices-vfio-driver.adoc @@ -83,14 +83,14 @@ $ oc get MachineConfig [source,terminal] ---- NAME GENERATEDBYCONTROLLER IGNITIONVERSION AGE -00-master d3da910bfa9f4b599af4ed7f5ac270d55950a3a1 3.2.0 25h -00-worker d3da910bfa9f4b599af4ed7f5ac270d55950a3a1 3.2.0 25h -01-master-container-runtime d3da910bfa9f4b599af4ed7f5ac270d55950a3a1 3.2.0 25h -01-master-kubelet d3da910bfa9f4b599af4ed7f5ac270d55950a3a1 3.2.0 25h -01-worker-container-runtime d3da910bfa9f4b599af4ed7f5ac270d55950a3a1 3.2.0 25h -01-worker-kubelet d3da910bfa9f4b599af4ed7f5ac270d55950a3a1 3.2.0 25h -100-worker-iommu 3.2.0 30s -100-worker-vfiopci-configuration 3.2.0 30s +00-master d3da910bfa9f4b599af4ed7f5ac270d55950a3a1 3.5.0 25h +00-worker d3da910bfa9f4b599af4ed7f5ac270d55950a3a1 3.5.0 25h +01-master-container-runtime d3da910bfa9f4b599af4ed7f5ac270d55950a3a1 3.5.0 25h +01-master-kubelet d3da910bfa9f4b599af4ed7f5ac270d55950a3a1 3.5.0 25h +01-worker-container-runtime d3da910bfa9f4b599af4ed7f5ac270d55950a3a1 3.5.0 25h +01-worker-kubelet d3da910bfa9f4b599af4ed7f5ac270d55950a3a1 3.5.0 25h +100-worker-iommu 3.5.0 30s +100-worker-vfiopci-configuration 3.5.0 30s ---- .Verification diff --git a/modules/virt-using-wasp-agent-to-configure-higher-vm-workload-density.adoc b/modules/virt-using-wasp-agent-to-configure-higher-vm-workload-density.adoc index 0deb83fc4252..61607832b59b 100644 --- a/modules/virt-using-wasp-agent-to-configure-higher-vm-workload-density.adoc +++ b/modules/virt-using-wasp-agent-to-configure-higher-vm-workload-density.adoc @@ -71,7 +71,7 @@ metadata: spec: config: ignition: - version: 3.4.0 + version: 3.5.0 systemd: units: - contents: |