Skip to content

Commit 1d9dfe0

Browse files
authored
Merge pull request #72318 from aireilly/OCPBUGS-20430
OCPBUGS-20430 - Updates incorrect ConfigMap namespace: multicluster-engine
2 parents 5c57280 + 6544e98 commit 1d9dfe0

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

modules/ztp-configuring-the-cluster-for-a-disconnected-environment.adoc

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ If you enable TLS for the HTTP server, you must confirm the root certificate is
2828
apiVersion: v1
2929
kind: ConfigMap
3030
metadata:
31-
name: assisted-installer-config-map
32-
namespace: "<infrastructure_operator_namespace>" <1>
31+
name: assisted-installer-mirror-config
32+
namespace: multicluster-engine <1>
3333
labels:
3434
app: assisted-service
3535
data:
@@ -49,7 +49,7 @@ data:
4949
[[registry.mirror]]
5050
location = "mirror1.registry.corp.com:5000/example-repository" <5>
5151
----
52-
<1> The `ConfigMap` namespace must be the same as the namespace of the Infrastructure Operator.
52+
<1> The `ConfigMap` namespace must be set to `multicluster-engine`.
5353
<2> The mirror registry’s certificate that is used when creating the mirror registry.
5454
<3> The configuration file for the mirror registry. The mirror registry configuration adds mirror information to the `/etc/containers/registries.conf` file in the discovery image. The mirror information is stored in the `imageContentSources` section of the `install-config.yaml` file when the information is passed to the installation program. The Assisted Service pod that runs on the hub cluster fetches the container images from the configured mirror registry.
5555
<4> The URL of the mirror registry. You must use the URL from the `imageContentSources` section by running the `oc adm release mirror` command when you configure the mirror registry. For more information, see the _Mirroring the OpenShift Container Platform image repository_ section.
@@ -65,6 +65,7 @@ apiVersion: agent-install.openshift.io/v1beta1
6565
kind: AgentServiceConfig
6666
metadata:
6767
name: agent
68+
namespace: multicluster-engine <1>
6869
spec:
6970
databaseStorage:
7071
volumeName: <db_pv_name>
@@ -81,12 +82,14 @@ spec:
8182
requests:
8283
storage: <fs_storage_size>
8384
mirrorRegistryRef:
84-
name: 'assisted-installer-mirror-config'
85+
name: 'assisted-installer-mirror-config' <2>
8586
osImages:
8687
- openshiftVersion: <ocp_version>
87-
url: <iso_url> <1>
88+
url: <iso_url> <3>
8889
----
89-
<1> Must match the URL of the HTTPD server.
90+
<1> Set the `AgentServiceConfig` namespace to `multicluster-engine` to match the `ConfigMap` namespace
91+
<2> Set `mirrorRegistryRef.name` to match the definition specified in the related `ConfigMap` CR
92+
<3> Set the URL for the ISO hosted on `httpd` server
9093
9194
[IMPORTANT]
9295
====

0 commit comments

Comments
 (0)