Skip to content

Commit 2f0df59

Browse files
committed
OCPBUGS-5913: The string host is removed from any file paths in the image-configuation section
1 parent e085abd commit 2f0df59

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

modules/images-configuration-allowed.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ status:
5959
Either the `allowedRegistries` parameter or the `blockedRegistries` parameter can be set, but not both.
6060
====
6161
+
62-
The Machine Config Operator (MCO) watches the `image.config.openshift.io/cluster` resource for any changes to the registries. When the MCO detects a change, it drains the nodes, applies the change, and uncordons the nodes. After the nodes return to the `Ready` state, the allowed registries list is used to update the image signature policy in the `/host/etc/containers/policy.json` file on each node.
62+
The Machine Config Operator (MCO) watches the `image.config.openshift.io/cluster` resource for any changes to the registries. When the MCO detects a change, it drains the nodes, applies the change, and uncordons the nodes. After the nodes return to the `Ready` state, the allowed registries list is used to update the image signature policy in the `/etc/containers/policy.json` file on each node.
6363
6464
ifndef::openshift-rosa,openshift-dedicated[]
6565
.Verification
@@ -83,14 +83,14 @@ NAME STATUS ROLES AGE VERSION
8383
+
8484
[source,terminal]
8585
----
86-
$ oc debug node/<node_name>
86+
$ oc debug node/<node_name>
8787
----
8888

89-
. When prompted, enter `chroot/host` into the terminal:
89+
. When prompted, enter `chroot /host` into the terminal:
9090
+
9191
[source,terminal]
9292
----
93-
sh-4.4# chroot/host
93+
sh-4.4# chroot /host
9494
----
9595

9696
. Enter the following command to check that the registries have been added to the policy file:

modules/images-configuration-blocked.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,14 @@ NAME STATUS ROLES AGE VERSION
8080
+
8181
[source,terminal]
8282
----
83-
$ oc debug node/<node_name>
83+
$ oc debug node/<node_name>
8484
----
8585

86-
. When prompted, enter `chroot/host` into the terminal:
86+
. When prompted, enter `chroot /host` into the terminal:
8787
+
8888
[source,terminal]
8989
----
90-
sh-4.4# chroot/host
90+
sh-4.4# chroot /host
9191
----
9292

9393
. Enter the following command to check that the registries have been added to the policy file:

modules/images-configuration-insecure.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ ifndef::openshift-rosa,openshift-dedicated[]
7373
+
7474
[source,terminal]
7575
----
76-
$ cat /host/etc/containers/registries.conf
76+
$ cat /etc/containers/registries.conf
7777
----
7878
+
7979
The following example indicates that images from the `insecure.com` registry is insecure and is allowed for image pulls and pushes.

modules/images-configuration-shortname.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Potentially add the last line to the Ignoring image registry repository mirrorin
3131
////
3232
====
3333

34-
The Machine Config Operator (MCO) watches the `image.config.openshift.io/cluster` resource for any changes to the registries. When the MCO detects a change, it drains the nodes, applies the change, and uncordons the nodes. After the nodes return to the `Ready` state, if the `containerRuntimeSearchRegistries` parameter is added, the MCO creates a file in the `/etc/containers/registries.conf.d` directory on each node with the listed registries. The file overrides the default list of unqualified search registries in the `/host/etc/containers/registries.conf` file. There is no way to fall back to the default list of unqualified search registries.
34+
The Machine Config Operator (MCO) watches the `image.config.openshift.io/cluster` resource for any changes to the registries. When the MCO detects a change, it drains the nodes, applies the change, and uncordons the nodes. After the nodes return to the `Ready` state, if the `containerRuntimeSearchRegistries` parameter is added, the MCO creates a file in the `/etc/containers/registries.conf.d` directory on each node with the listed registries. The file overrides the default list of unqualified search registries in the `/etc/containers/registries.conf` file. There is no way to fall back to the default list of unqualified search registries.
3535

3636
The `containerRuntimeSearchRegistries` parameter works only with the Podman and CRI-O container engines. The registries in the list can be used only in pod specs, not in builds and image streams.
3737

@@ -112,21 +112,21 @@ NAME STATUS ROLES AGE VERSION
112112
+
113113
[source,terminal]
114114
----
115-
$ oc debug node/<node_name>
115+
$ oc debug node/<node_name>
116116
----
117117

118-
. When prompted, enter `chroot/host` into the terminal:
118+
. When prompted, enter `chroot /host` into the terminal:
119119
+
120120
[source,terminal]
121121
----
122-
sh-4.4# chroot/host
122+
sh-4.4# chroot /host
123123
----
124124

125125
. Enter the following command to check that the registries have been added to the policy file:
126126
+
127127
[source,terminal]
128128
----
129-
sh-5.1# cat /etc/containers/registries.conf.d/01-image-searchRegistries.conf
129+
sh-5.1# cat /etc/containers/registries.conf.d/01-image-searchRegistries.conf
130130
----
131131
+
132132
.Example output

0 commit comments

Comments
 (0)