openshift · abrennan89 · Aug 1, 2024 · Jul 26, 2024
diff --git a/_topic_maps/_topic_map.yml b/_topic_maps/_topic_map.yml
@@ -583,6 +583,8 @@ Topics:
   File: node-tasks
 - Name: Postinstallation network configuration
   File: post-install-network-configuration
+- Name: Configuring image streams and image registries
+  File: post-install-image-config
 - Name: Storage configuration
   File: post-install-storage-configuration
 - Name: Preparing for users

diff --git a/modules/images-configuration-cas.adoc b/modules/images-configuration-cas.adoc
@@ -2,7 +2,6 @@
 //
 // * registry/configuring-registry-operator.adoc
 // * openshift_images/image-configuration.adoc
-// * post_installation_configuration/preparing-for-users.adoc
 
 :_mod-docs-content-type: PROCEDURE
 [id="images-configuration-cas_{context}"]

diff --git a/modules/images-configuration-file.adoc b/modules/images-configuration-file.adoc
@@ -1,7 +1,6 @@
 // Module included in the following assemblies:
 //
 // * openshift_images/image-configuration.adoc
-// * post_installation_configuration/preparing-for-users.adoc
 
 :_mod-docs-content-type: PROCEDURE
 [id="images-configuration-file_{context}"]

diff --git a/modules/images-configuration-parameters.adoc b/modules/images-configuration-parameters.adoc
@@ -1,7 +1,6 @@
 // Module included in the following assemblies:
 //
 // * openshift_images/image-configuration.adoc
-// * post_installation_configuration/preparing-for-users.adoc
 
 [id="images-configuration-parameters_{context}"]
 = Image controller configuration parameters

diff --git a/modules/images-configuration-registry-mirror-configuring.adoc b/modules/images-configuration-registry-mirror-configuring.adoc
@@ -1,7 +1,6 @@
 // Module included in the following assemblies:
 //
 // * openshift_images/image-configuration.adoc
-// * post_installation_configuration/preparing-for-users.adoc
 // * updating/updating_a_cluster/updating_disconnected_cluster/disconnected-update.adoc
 
 :_mod-docs-content-type: PROCEDURE
@@ -94,7 +93,7 @@ spec:
 <9> Optional: Indicates a registry, which allows you to use any image in that registry. If you specify a registry name, the object is applied to all repositories from a source registry to a mirror registry.
 <10> Pulls the image `registry.example.com/example/myimage@sha256:...` from the mirror `mirror.example.net/image@sha256:..`.
 <11> Pulls the image `registry.example.com/example/image@sha256:...` in the source registry namespace from the mirror `mirror.example.net/image@sha256:...`.
-<12> Pulls the image `registry.example.com/myimage@sha256` from the mirror registry `example.net/registry-example-com/myimage@sha256:...`. 
+<12> Pulls the image `registry.example.com/myimage@sha256` from the mirror registry `example.net/registry-example-com/myimage@sha256:...`.
 
 * Create an `ImageContentSourcePolicy` custom resource, replacing the source and mirrors with your own registry and repository pairs and images:
 +

diff --git a/modules/images-configuration-registry-mirror-convert.adoc b/modules/images-configuration-registry-mirror-convert.adoc
@@ -1,7 +1,6 @@
 // Module included in the following assemblies:
 //
 // * openshift_images/image-configuration.adoc
-// * post_installation_configuration/preparing-for-users.adoc
 // * updating/updating-restricted-network-cluster/restricted-network-update.adoc
 
 :_mod-docs-content-type: PROCEDURE
@@ -12,7 +11,7 @@ Using an `ImageContentSourcePolicy` (ICSP) object to configure repository mirror
 
 ICSP objects are being replaced by `ImageDigestMirrorSet` and `ImageTagMirrorSet` objects to configure repository mirroring. If you have existing YAML files that you used to create `ImageContentSourcePolicy` objects, you can use the `oc adm migrate icsp` command to convert those files to an `ImageDigestMirrorSet` YAML file. The command updates the API to the current version, changes the `kind` value to `ImageDigestMirrorSet`, and changes `spec.repositoryDigestMirrors` to `spec.imageDigestMirrors`. The rest of the file is not changed.
 
-Because the migration does not change the `registries.conf` file, the cluster does not need to reboot. 
+Because the migration does not change the `registries.conf` file, the cluster does not need to reboot.
 
 For more information about `ImageDigestMirrorSet` or `ImageTagMirrorSet` objects, see "Configuring image registry repository mirroring" in the previous section.
 
@@ -72,5 +71,3 @@ where:
 --
 
 . Remove the ICSP objects after the IDMS objects are rolled out.
-
-
diff --git a/modules/images-configuration-registry-mirror.adoc b/modules/images-configuration-registry-mirror.adoc
@@ -1,7 +1,6 @@
 // Module included in the following assemblies:
 //
 // * openshift_images/image-configuration.adoc
-// * post_installation_configuration/preparing-for-users.adoc
 // * updating/updating-restricted-network-cluster/restricted-network-update.adoc
 
 :_mod-docs-content-type: CONCEPT
@@ -53,6 +52,6 @@ requested from the source repository.
 
 For new clusters, you can use IDMS, ITMS, and ICSP CRs objects as desired. However, using IDMS and ITMS is recommended.
 
-If you upgraded a cluster, any existing ICSP objects remain stable, and both IDMS and ICSP objects are supported. Workloads using ICSP objects continue to function as expected. However, if you want to take advantage of the fallback policies introduced in the IDMS CRs, you can migrate current workloads to IDMS objects by using the `oc adm migrate icsp` command as shown in the *Converting ImageContentSourcePolicy (ICSP) files for image registry repository mirroring* section that follows. Migrating to IDMS objects does not require a cluster reboot. 
+If you upgraded a cluster, any existing ICSP objects remain stable, and both IDMS and ICSP objects are supported. Workloads using ICSP objects continue to function as expected. However, if you want to take advantage of the fallback policies introduced in the IDMS CRs, you can migrate current workloads to IDMS objects by using the `oc adm migrate icsp` command as shown in the *Converting ImageContentSourcePolicy (ICSP) files for image registry repository mirroring* section that follows. Migrating to IDMS objects does not require a cluster reboot.
 
 include::snippets/idms-global-pull-secret.adoc[]
diff --git a/modules/images-update-global-pull-secret.adoc b/modules/images-update-global-pull-secret.adoc
@@ -1,6 +1,5 @@
 // Module included in the following assemblies:
 // * openshift_images/managing_images/using-image-pull-secrets.adoc
-// * post_installation_configuration/cluster-tasks.adoc
 // * updating/updating-restricted-network-cluster/restricted-network-update-osus.adoc
 // * support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc
 //