cleanup mirror config

loganmc10 · Aug 5, 2024 · 5f5392c · 5f5392c
1 parent ed5f0ad
commit 5f5392c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 20 deletions.
diff --git a/edge/install-config-sno-example.yaml b/edge/install-config-sno-example.yaml
@@ -99,11 +99,8 @@ sshKey: |
   ssh-rsa ...
 imageDigestSources:
   - mirrors:
-      - <mirror_hostname>:8443/openshift-release-dev/ocp-v4.0-art-dev
-    source: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-  - mirrors:
-      - <mirror_hostname>:8443/openshift-release-dev/ocp-release
-    source: quay.io/openshift-release-dev/ocp-release
+      - <mirror_hostname>:8443/openshift-release-dev
+    source: quay.io/openshift-release-dev
   - mirrors:
       - <mirror_hostname>:8443/multicluster-engine
     source: registry.redhat.io/multicluster-engine
@@ -113,6 +110,9 @@ imageDigestSources:
   - mirrors:
       - <mirror_hostname>:8443/rhel8
     source: registry.redhat.io/rhel8
+  - mirrors:
+      - <mirror_hostname>:8443/rhel9
+    source: registry.redhat.io/rhel9
   - mirrors:
       - <mirror_hostname>:8443/openshift4
     source: registry.redhat.io/openshift4

diff --git a/edge/install-config-standard-example.yaml b/edge/install-config-standard-example.yaml
@@ -168,11 +168,8 @@ sshKey: |
   ssh-rsa ...
 imageDigestSources:
   - mirrors:
-      - <mirror_hostname>:8443/openshift-release-dev/ocp-v4.0-art-dev
-    source: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-  - mirrors:
-      - <mirror_hostname>:8443/openshift-release-dev/ocp-release
-    source: quay.io/openshift-release-dev/ocp-release
+      - <mirror_hostname>:8443/openshift-release-dev
+    source: quay.io/openshift-release-dev
   - mirrors:
       - <mirror_hostname>:8443/multicluster-engine
     source: registry.redhat.io/multicluster-engine
@@ -182,6 +179,9 @@ imageDigestSources:
   - mirrors:
       - <mirror_hostname>:8443/rhel8
     source: registry.redhat.io/rhel8
+  - mirrors:
+      - <mirror_hostname>:8443/rhel9
+    source: registry.redhat.io/rhel9
   - mirrors:
       - <mirror_hostname>:8443/openshift4
     source: registry.redhat.io/openshift4

diff --git a/provisioning/roles/provisioning_mce/templates/mirror-cm.yaml.j2 b/provisioning/roles/provisioning_mce/templates/mirror-cm.yaml.j2
@@ -13,19 +13,11 @@ data:
 
     [[registry]]
        prefix = ""
-       location = "quay.io/openshift-release-dev/ocp-v4.0-art-dev"
+       location = "quay.io/openshift-release-dev"
        mirror-by-digest-only = true
 
        [[registry.mirror]]
-       location = "{{ mirror_hostname }}{% if mirror_port != 443 %}:{{ mirror_port }}{% endif %}{% if mirror_subpath is defined %}/{{ mirror_subpath }}{% endif %}/openshift-release-dev/ocp-v4.0-art-dev"
-
-    [[registry]]
-       prefix = ""
-       location = "quay.io/openshift-release-dev/ocp-release"
-       mirror-by-digest-only = true
-
-       [[registry.mirror]]
-       location = "{{ mirror_hostname }}{% if mirror_port != 443 %}:{{ mirror_port }}{% endif %}{% if mirror_subpath is defined %}/{{ mirror_subpath }}{% endif %}/openshift-release-dev/ocp-release"
+       location = "{{ mirror_hostname }}{% if mirror_port != 443 %}:{{ mirror_port }}{% endif %}{% if mirror_subpath is defined %}/{{ mirror_subpath }}{% endif %}/openshift-release-dev"
 
     [[registry]]
        prefix = ""