Skip to content

Commit 5fb5ef4

Browse files
authored
Merge pull request #27390 from maxwelldb/updating-cluster-ref-term-updates
API obj terminology update - "Updating clusters"
2 parents 37083b2 + 6df147c commit 5fb5ef4

5 files changed

+17
-18
lines changed

modules/images-configuration-registry-mirror.adoc

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,14 @@ spec:
107107
<1> Indicates the name of the image registry and repository
108108
<2> Indicates the registry and repository containing the content that is mirrored
109109

110-
. Create the new `ImageContentSourcePolicy`:
110+
. Create the new `ImageContentSourcePolicy` object:
111111
+
112112
[source,terminal]
113113
----
114114
$ oc create -f registryrepomirror.yaml
115115
----
116116
+
117-
After the `ImageContentSourcePolicy` is created,
117+
After the `ImageContentSourcePolicy` object is created,
118118
the new settings are deployed to each node
119119
and shortly start using the mirrored repository
120120
for requests to the source repository.
@@ -192,7 +192,7 @@ unqualified-search-registries = ["registry.access.redhat.com", "docker.io"]
192192
----
193193

194194
.. Pull an image digest to the node from the source and check if it is actually
195-
resolved by the mirror. The `ImageContentSourcePolicy` supports image digests only, not image tags.
195+
resolved by the mirror. `ImageContentSourcePolicy` objects support image digests only, not image tags.
196196
+
197197
[source,terminal]
198198
----
@@ -209,5 +209,4 @@ troubleshoot the problem.
209209
* The main registry will only be used if no other mirror works.
210210
* From the system context, the `Insecure` flags are used as fallback.
211211
* The format of the `/etc/containers/registries` file has
212-
changed recently. It is now version 2 and in TOML format.
213-
*
212+
changed recently. It is now version 2 and in TOML format.

modules/update-configuring-image-signature.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
// * updating/updating-restricted-network-cluster.adoc
44

55
[id="update-configuring-image-signature"]
6-
= Creating an image signature ConfigMap manually
6+
= Creating an image signature config map manually
77

8-
Create and apply the image signature ConfigMap to the cluster that you want to update.
8+
Create and apply the image signature config map to the cluster that you want to update.
99

1010
[NOTE]
1111
====
@@ -61,7 +61,7 @@ $ DIGEST_ENCODED="${DIGEST#*:}"
6161
$ SIGNATURE_BASE64=$(curl -s "https://mirror.openshift.com/pub/openshift-v4/signatures/openshift/release/${DIGEST_ALGO}=${DIGEST_ENCODED}/signature-1" | base64 -w0 && echo)
6262
----
6363

64-
. Create the ConfigMap:
64+
. Create the config map:
6565
+
6666
[source,terminal]
6767
----
@@ -78,7 +78,7 @@ binaryData:
7878
EOF
7979
----
8080

81-
. Apply the ConfigMap to the cluster to update:
81+
. Apply the config map to the cluster to update:
8282
+
8383
[source,terminal]
8484
----

modules/update-mirror-repository.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ $ oc image mirror -a ${LOCAL_SECRET_JSON} --from-dir=${REMOVABLE_MEDIA_PATH}/mi
108108
+
109109
<1> For `REMOVABLE_MEDIA_PATH`, you must use the same path that you specified when you mirrored the images.
110110

111-
** If the local container registry and the cluster are connected to the mirror host, directly push the release images to the local registry and apply the ConfigMap to the cluster by using following command:
111+
** If the local container registry and the cluster are connected to the mirror host, directly push the release images to the local registry and apply the config map to the cluster by using following command:
112112
+
113113
[source,terminal]
114114
----
@@ -118,5 +118,5 @@ $ oc adm release mirror -a ${LOCAL_SECRET_JSON} --from=quay.io/${PRODUCT_REPO}/$
118118
+
119119
[NOTE]
120120
====
121-
If you include the `--apply-release-image-signature` option, do not create the ConfigMap for image signature verification.
121+
If you include the `--apply-release-image-signature` option, do not create the config map for image signature verification.
122122
====

modules/update-oc-configmap-signature-verification.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
// * updating/updating-restricted-network-cluster.adoc
44

55
[id="update-oc-configmap-signature-verification_{context}"]
6-
= Creating the ConfigMap for image signature verification by using the `oc` CLI
6+
= Creating the config map for image signature verification by using the `oc` CLI
77

8-
Before you update your cluster, you must manually create a ConfigMap that contains the signatures of the release images that you use. This signature allows the Cluster Version Operator (CVO) to verify that the release images have not been modified by comparing the expected and actual image signatures.
8+
Before you update your cluster, you must manually create a config map that contains the signatures of the release images that you use. This signature allows the Cluster Version Operator (CVO) to verify that the release images have not been modified by comparing the expected and actual image signatures.
99

1010
[NOTE]
1111
====
12-
If you are upgrading from a release prior to version 4.4.8, you must use the manual method for creating the ConfigMap instead of this procedure. The commands that this procedure uses are not in earlier versions of the `oc` command-line interface (CLI).
12+
If you are upgrading from a release prior to version 4.4.8, you must use the manual method for creating the config map instead of this procedure. The commands that this procedure uses are not in earlier versions of the `oc` command-line interface (CLI).
1313
====
1414

1515
.Prerequisites
@@ -22,7 +22,7 @@ If you are upgrading from a release prior to version 4.4.8, you must use the man
2222

2323
. Use `oc` command-line interface (CLI) to log into the cluster that you are upgrading.
2424

25-
. Apply the mirrored release image signature ConfigMap to the connected cluster:
25+
. Apply the mirrored release image signature config map to the connected cluster:
2626
+
2727
[source,terminal]
2828
----

updating/updating-restricted-network-cluster.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ include::modules/installation-adding-registry-pull-secret.adoc[leveloffset=+1]
3636
include::modules/update-mirror-repository.adoc[leveloffset=+1]
3737

3838
[id="updating-restricted-network-image-signature-configmap"]
39-
== Creating the image signature ConfigMap
39+
== Creating the image signature config map
4040

41-
Before you update your cluster, you must manually create a ConfigMap that contains the signatures of the release images that you use. This signature allows the Cluster Version Operator (CVO) to verify that the release images have not been modified by comparing the expected and actual image signatures.
41+
Before you update your cluster, you must manually create a config map that contains the signatures of the release images that you use. This signature allows the Cluster Version Operator (CVO) to verify that the release images have not been modified by comparing the expected and actual image signatures.
4242

43-
If you are upgrading from version 4.4.8 or later, you can use the `oc` CLI to create the ConfigMap. If you are upgrading from an earlier version, you must use the manual method.
43+
If you are upgrading from version 4.4.8 or later, you can use the `oc` CLI to create the config map. If you are upgrading from an earlier version, you must use the manual method.
4444

4545
include::modules/update-oc-configmap-signature-verification.adoc[leveloffset=+2]
4646

0 commit comments

Comments
 (0)