diff --git a/machine_configuration/machine-configs-configure.adoc b/machine_configuration/machine-configs-configure.adoc index 1d098ec2be..2514cfe583 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_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. +{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. 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-status.adoc b/modules/checking-mco-status.adoc index f676ef98ed..cc749e9cbc 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.2.0 5h18m -00-worker 2c9371fbb673b97a6fe8b1c52... 3.2.0 5h18m -01-master-container-runtime 2c9371fbb673b97a6fe8b1c52... 3.2.0 5h18m -01-master-kubelet 2c9371fbb673b97a6fe8b1c52… 3.2.0 5h18m +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 ... -rendered-master-dde... 2c9371fbb673b97a6fe8b1c52... 3.2.0 5h18m -rendered-worker-fde... 2c9371fbb673b97a6fe8b1c52... 3.2.0 5h18m +rendered-master-dde... 2c9371fbb673b97a6fe8b1c52... 3.4.0 5h18m +rendered-worker-fde... 2c9371fbb673b97a6fe8b1c52... 3.4.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.2.0 + Version: 3.4.0 Storage: Files: Contents: diff --git a/modules/cnf-disable-chronyd.adoc b/modules/cnf-disable-chronyd.adoc index e7554dd615..5ef5bba4c0 100644 --- a/modules/cnf-disable-chronyd.adoc +++ b/modules/cnf-disable-chronyd.adoc @@ -30,7 +30,7 @@ metadata: spec: config: ignition: - version: 3.2.0 + version: 3.4.0 systemd: units: - contents: | diff --git a/modules/core-user-password.adoc b/modules/core-user-password.adoc index 34346d250a..aa8e498c44 100644 --- a/modules/core-user-password.adoc +++ b/modules/core-user-password.adoc @@ -45,7 +45,7 @@ metadata: spec: config: ignition: - version: 3.2.0 + version: 3.4.0 passwd: users: - name: core <1> diff --git a/modules/coreos-layering-configuring.adoc b/modules/coreos-layering-configuring.adoc index dcb8dc875e..2638d73257 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.2.0 95m -00-worker 5bdb57489b720096ef912f738b46330a8f577803 3.2.0 95m -01-master-container-runtime 5bdb57489b720096ef912f738b46330a8f577803 3.2.0 95m -01-master-kubelet 5bdb57489b720096ef912f738b46330a8f577803 3.2.0 95m -01-worker-container-runtime 5bdb57489b720096ef912f738b46330a8f577803 3.2.0 95m -01-worker-kubelet 5bdb57489b720096ef912f738b46330a8f577803 3.2.0 95m -99-master-generated-registries 5bdb57489b720096ef912f738b46330a8f577803 3.2.0 95m +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.2.0 95m +99-worker-generated-registries 5bdb57489b720096ef912f738b46330a8f577803 3.4.0 95m 99-worker-ssh 3.2.0 98m os-layer-custom 10s <1> -rendered-master-15961f1da260f7be141006404d17d39b 5bdb57489b720096ef912f738b46330a8f577803 3.2.0 95m -rendered-worker-5aff604cb1381a4fe07feaf1595a797e 5bdb57489b720096ef912f738b46330a8f577803 3.2.0 95m -rendered-worker-5de4837625b1cbc237de6b22bc0bc873 5bdb57489b720096ef912f738b46330a8f577803 3.2.0 4s <2> +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> ---- <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 ae96c0d014..3e898889b3 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.2.0 57m +01-master-container-runtime b5c5119de007945b6fe6fb215db3b8e2ceb12511 3.4.0 57m ... -01-worker-container-runtime b5c5119de007945b6fe6fb215db3b8e2ceb12511 3.2.0 57m +01-worker-container-runtime b5c5119de007945b6fe6fb215db3b8e2ceb12511 3.4.0 57m ... -99-worker-generated-containerruntime b5c5119de007945b6fe6fb215db3b8e2ceb12511 3.2.0 26m -99-worker-generated-containerruntime-1 b5c5119de007945b6fe6fb215db3b8e2ceb12511 3.2.0 17m -99-worker-generated-containerruntime-2 b5c5119de007945b6fe6fb215db3b8e2ceb12511 3.2.0 7m26s +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 ... ---- @@ -143,7 +143,7 @@ $ oc get machineconfigs | grep containerrun .Example output [source,terminal] ---- -99-worker-generated-containerruntime 2c9371fbb673b97a6fe8b1c52691999ed3a1bfc2 3.2.0 31s +99-worker-generated-containerruntime 2c9371fbb673b97a6fe8b1c52691999ed3a1bfc2 3.4.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 187ffe4bb9..80868cc42e 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.2.0 26m +99-worker-generated-kubelet-1 b5c5119de007945b6fe6fb215db3b8e2ceb12511 3.4.0 26m ... ---- diff --git a/modules/machine-config-overview.adoc b/modules/machine-config-overview.adoc index 5d2e28547c..84e8df15a7 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_2/[Ignition Configuration Specification v3.2.0] for details. +* 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. * 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/nodes-nodes-kernel-arguments.adoc b/modules/nodes-nodes-kernel-arguments.adoc index 85ed0b3a83..e7eb3e0ae9 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.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 -99-master-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m +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 99-master-ssh 3.2.0 40m -99-worker-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m +99-worker-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m 99-worker-ssh 3.2.0 40m -rendered-master-23e785de7587df95a4b517e0647e5ab7 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m -rendered-worker-5d596d9293ca3ea80c896a1191735bb1 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m +rendered-master-23e785de7587df95a4b517e0647e5ab7 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m +rendered-worker-5d596d9293ca3ea80c896a1191735bb1 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m ---- ifndef::openshift-origin[] @@ -129,7 +129,7 @@ metadata: spec: config: ignition: - version: 3.2.0 + version: 3.4.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.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 -05-worker-kernelarg-selinuxpermissive 3.2.0 105s -99-master-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m +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 99-master-ssh 3.2.0 40m -99-worker-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m +99-worker-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m 99-worker-ssh 3.2.0 40m -rendered-master-23e785de7587df95a4b517e0647e5ab7 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m -rendered-worker-5d596d9293ca3ea80c896a1191735bb1 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m +rendered-master-23e785de7587df95a4b517e0647e5ab7 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m +rendered-worker-5d596d9293ca3ea80c896a1191735bb1 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m ---- . Check the nodes: diff --git a/modules/rhcos-add-extensions.adoc b/modules/rhcos-add-extensions.adoc index 2b2750071e..97238cc10e 100644 --- a/modules/rhcos-add-extensions.adoc +++ b/modules/rhcos-add-extensions.adoc @@ -36,7 +36,7 @@ metadata: spec: config: ignition: - version: 3.2.0 + version: 3.4.0 extensions: - usbguard EOF @@ -63,7 +63,7 @@ $ oc get machineconfig 80-worker-extensions [source,terminal] ---- NAME GENERATEDBYCONTROLLER IGNITIONVERSION AGE -80-worker-extensions 3.2.0 57s +80-worker-extensions 3.4.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 76fdeed0f7..6329f1976b 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.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 -99-master-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m +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 99-master-ssh 3.2.0 40m -99-worker-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m -99-worker-kargs-mpath 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 105s +99-worker-generated-registries 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m +99-worker-kargs-mpath 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 105s 99-worker-ssh 3.2.0 40m -rendered-master-23e785de7587df95a4b517e0647e5ab7 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m -rendered-worker-5d596d9293ca3ea80c896a1191735bb1 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.2.0 33m +rendered-master-23e785de7587df95a4b517e0647e5ab7 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.0 33m +rendered-worker-5d596d9293ca3ea80c896a1191735bb1 52dd3ba6a9a527fc3ab42afac8d12b693534c8c9 3.4.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 d33a53ca53..6c675473c2 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.2.0 7m42s -rendered-worker-xyz 4173030d89fbf4a7a0976d1665491a4d9a6e54f1 3.2.0 7m36s +99-worker-generated-containerruntime 4173030d89fbf4a7a0976d1665491a4d9a6e54f1 3.4.0 7m42s +rendered-worker-xyz 4173030d89fbf4a7a0976d1665491a4d9a6e54f1 3.4.0 7m36s ---- . After those objects are created, monitor the machine config pool for the changes to be applied: