From 3870e8c897fba40166b5a4309a819bbbd2a4d508 Mon Sep 17 00:00:00 2001 From: Andres Gilgado Date: Fri, 14 Aug 2026 10:52:32 +0200 Subject: [PATCH 1/4] CNF-26586: Update registry path from openshift4 to openshift5 Replace all occurrences of the openshift4 registry namespace with openshift5 across telco-hub, telco-core, and tekton build pipelines. Co-authored-by: Cursor --- .tekton/build-pipeline-telco-core-rds.yaml | 2 +- .tekton/build-pipeline-telco-hub-rds.yaml | 2 +- telco-core/Dockerfile.telco-core | 2 +- telco-core/configuration/core-baseline.yaml | 2 +- .../reference-crs/required/scheduling/sched.yaml | 2 +- telco-hub/Dockerfile.telco-hub | 2 +- .../acm/acmMirrorRegistryCM-patch.yaml | 4 ++-- .../registry/idms-operator-mirrors-patch.yaml | 4 ++-- .../registry/itms-generic-mirrors-patch.yaml | 4 ++-- .../reference-crs-kube-compare/default_value.yaml | 12 ++++++------ .../required/acm/acmMirrorRegistryCM.yaml | 4 ++-- .../required/gitops/addPluginsPolicy.yaml | 2 +- .../required/gitops/get_ztp_installation.sh | 4 ++-- .../required/registry/idms-operator.yaml | 4 ++-- .../required/registry/itms-generic.yaml | 4 ++-- .../install/mirror-registry/imageset-config.yaml | 2 +- 16 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.tekton/build-pipeline-telco-core-rds.yaml b/.tekton/build-pipeline-telco-core-rds.yaml index b9827b86b..27326a436 100644 --- a/.tekton/build-pipeline-telco-core-rds.yaml +++ b/.tekton/build-pipeline-telco-core-rds.yaml @@ -257,7 +257,7 @@ spec: - description=Telco Core RDS manifests - distribution-scope=public - io.k8s.description=Telco Core RDS manifests - - name=openshift4/openshift-telco-core-rds-rhel9 + - name=openshift5/openshift-telco-core-rds-rhel9 - release=4.22 - url=https://github.com/openshift-kni/telco-reference - vendor=Red Hat, Inc. diff --git a/.tekton/build-pipeline-telco-hub-rds.yaml b/.tekton/build-pipeline-telco-hub-rds.yaml index c5e2e24d9..92711cbb3 100644 --- a/.tekton/build-pipeline-telco-hub-rds.yaml +++ b/.tekton/build-pipeline-telco-hub-rds.yaml @@ -250,7 +250,7 @@ spec: - description=Telco Hub RDS manifests - distribution-scope=public - io.k8s.description=Telco Hub RDS manifests - - name=openshift4/openshift-telco-hub-rds-rhel9 + - name=openshift5/openshift-telco-hub-rds-rhel9 - release=4.22 - url=https://github.com/openshift-kni/telco-reference - vendor=Red Hat, Inc. diff --git a/telco-core/Dockerfile.telco-core b/telco-core/Dockerfile.telco-core index ebbd3058c..2bfc4461d 100644 --- a/telco-core/Dockerfile.telco-core +++ b/telco-core/Dockerfile.telco-core @@ -10,7 +10,7 @@ ENTRYPOINT ["/bin/bash"] CMD ["-c", "tar -cf - --directory /usr/share telco-core-rds | base64 -w0"] LABEL com.redhat.component="openshift-telco-core-rds-container" \ - name="openshift4/openshift-telco-core-rds-rhel9" \ + name="openshift5/openshift-telco-core-rds-rhel9" \ cpe="cpe:/a:redhat:openshift:5.0::el9" \ summary="Telco Core RDS manifests" \ io.openshift.expose-services="" \ diff --git a/telco-core/configuration/core-baseline.yaml b/telco-core/configuration/core-baseline.yaml index f71a08876..b7b99dd0a 100644 --- a/telco-core/configuration/core-baseline.yaml +++ b/telco-core/configuration/core-baseline.yaml @@ -110,4 +110,4 @@ policies: - path: reference-crs/required/scheduling/sched.yaml patches: - spec: - imageSpec: registry.example.com/openshift4/noderesourcetopology-scheduler-rhel9:v4.22.0 + imageSpec: registry.example.com/openshift5/noderesourcetopology-scheduler-rhel9:v5.0.0 diff --git a/telco-core/configuration/reference-crs/required/scheduling/sched.yaml b/telco-core/configuration/reference-crs/required/scheduling/sched.yaml index 84eada6de..8d08e7ef2 100644 --- a/telco-core/configuration/reference-crs/required/scheduling/sched.yaml +++ b/telco-core/configuration/reference-crs/required/scheduling/sched.yaml @@ -8,6 +8,6 @@ metadata: spec: # cacheResyncPeriod: "0" # Image spec should be the latest for the release - imageSpec: "registry.redhat.io/openshift4/noderesourcetopology-scheduler-rhel9:v4.22.0" + imageSpec: "registry.redhat.io/openshift5/noderesourcetopology-scheduler-rhel9:v5.0.0" # logLevel: "Trace" schedulerName: topo-aware-scheduler diff --git a/telco-hub/Dockerfile.telco-hub b/telco-hub/Dockerfile.telco-hub index 45ca5a4b9..accd7ae9c 100644 --- a/telco-hub/Dockerfile.telco-hub +++ b/telco-hub/Dockerfile.telco-hub @@ -10,7 +10,7 @@ ENTRYPOINT ["/bin/bash"] CMD ["-c", "tar -cf - --directory /usr/share telco-hub-rds | base64 -w0"] LABEL com.redhat.component="openshift-telco-hub-rds-container" \ - name="openshift4/openshift-telco-hub-rds-rhel9" \ + name="openshift5/openshift-telco-hub-rds-rhel9" \ cpe="cpe:/a:redhat:openshift:5.0::el9" \ summary="Telco Hub RDS manifests" \ io.openshift.expose-services="" \ diff --git a/telco-hub/configuration/example-overlays-config/acm/acmMirrorRegistryCM-patch.yaml b/telco-hub/configuration/example-overlays-config/acm/acmMirrorRegistryCM-patch.yaml index 4aa744dbf..415280d67 100644 --- a/telco-hub/configuration/example-overlays-config/acm/acmMirrorRegistryCM-patch.yaml +++ b/telco-hub/configuration/example-overlays-config/acm/acmMirrorRegistryCM-patch.yaml @@ -46,10 +46,10 @@ [[registry]] prefix = "" - location = "registry.redhat.io/openshift4" + location = "registry.redhat.io/openshift5" [[registry.mirror]] - location = "/openshift4" + location = "/openshift5" pull-from-mirror = "digest-only" [[registry]] diff --git a/telco-hub/configuration/example-overlays-config/registry/idms-operator-mirrors-patch.yaml b/telco-hub/configuration/example-overlays-config/registry/idms-operator-mirrors-patch.yaml index 104163d94..db023b8a7 100644 --- a/telco-hub/configuration/example-overlays-config/registry/idms-operator-mirrors-patch.yaml +++ b/telco-hub/configuration/example-overlays-config/registry/idms-operator-mirrors-patch.yaml @@ -30,8 +30,8 @@ - /rhacm2 source: registry.redhat.io/rhacm2 - mirrors: - - /openshift4 - source: registry.redhat.io/openshift4 + - /openshift5 + source: registry.redhat.io/openshift5 - mirrors: - /multicluster-engine/assisted-installer-agent-rhel9 source: registry.redhat.io/multicluster-engine/assisted-installer-agent-rhel9 diff --git a/telco-hub/configuration/example-overlays-config/registry/itms-generic-mirrors-patch.yaml b/telco-hub/configuration/example-overlays-config/registry/itms-generic-mirrors-patch.yaml index c9efe2e2f..a27d344b7 100644 --- a/telco-hub/configuration/example-overlays-config/registry/itms-generic-mirrors-patch.yaml +++ b/telco-hub/configuration/example-overlays-config/registry/itms-generic-mirrors-patch.yaml @@ -6,8 +6,8 @@ - /ubi8 source: registry.redhat.io/ubi8 - mirrors: - - /openshift4 - source: registry.redhat.io/openshift4 + - /openshift5 + source: registry.redhat.io/openshift5 - mirrors: - /rhel8 source: registry.redhat.io/rhel8 diff --git a/telco-hub/configuration/reference-crs-kube-compare/default_value.yaml b/telco-hub/configuration/reference-crs-kube-compare/default_value.yaml index 6fa23b32b..946d2a1ac 100644 --- a/telco-hub/configuration/reference-crs-kube-compare/default_value.yaml +++ b/telco-hub/configuration/reference-crs-kube-compare/default_value.yaml @@ -235,9 +235,9 @@ required_acm_acmMirrorRegistryCM: pull-from-mirror = "digest-only" [[registry]] prefix = "" - location = "registry.redhat.io/openshift4" + location = "registry.redhat.io/openshift5" [[registry.mirror]] - location = "/openshift4" + location = "/openshift5" pull-from-mirror = "digest-only" [[registry]] prefix = "" @@ -385,8 +385,8 @@ required_registry_idms_operator: - /rhacm2 source: registry.redhat.io/rhacm2 - mirrors: - - /openshift4 - source: registry.redhat.io/openshift4 + - /openshift5 + source: registry.redhat.io/openshift5 - mirrors: - /multicluster-engine/assisted-installer-agent-rhel9 source: registry.redhat.io/multicluster-engine/assisted-installer-agent-rhel9 @@ -421,8 +421,8 @@ required_registry_itms_generic: - /ubi8 source: registry.redhat.io/ubi8 - mirrors: - - /openshift4 - source: registry.redhat.io/openshift4 + - /openshift5 + source: registry.redhat.io/openshift5 - mirrors: - /rhel8 source: registry.redhat.io/rhel8 diff --git a/telco-hub/configuration/reference-crs/required/acm/acmMirrorRegistryCM.yaml b/telco-hub/configuration/reference-crs/required/acm/acmMirrorRegistryCM.yaml index 8df247b64..42183115a 100644 --- a/telco-hub/configuration/reference-crs/required/acm/acmMirrorRegistryCM.yaml +++ b/telco-hub/configuration/reference-crs/required/acm/acmMirrorRegistryCM.yaml @@ -53,9 +53,9 @@ data: pull-from-mirror = "digest-only" [[registry]] prefix = "" - location = "registry.redhat.io/openshift4" + location = "registry.redhat.io/openshift5" [[registry.mirror]] - location = "/openshift4" + location = "/openshift5" pull-from-mirror = "digest-only" [[registry]] prefix = "" diff --git a/telco-hub/configuration/reference-crs/required/gitops/addPluginsPolicy.yaml b/telco-hub/configuration/reference-crs/required/gitops/addPluginsPolicy.yaml index 614c02918..193aadf20 100644 --- a/telco-hub/configuration/reference-crs/required/gitops/addPluginsPolicy.yaml +++ b/telco-hub/configuration/reference-crs/required/gitops/addPluginsPolicy.yaml @@ -75,7 +75,7 @@ spec: mountPath: "/.config" terminationMessagePolicy: "File" terminationMessagePath: "/dev/termination-log" - image: "registry.redhat.io/openshift4/ztp-site-generate-rhel8:v4.22" + image: "registry.redhat.io/openshift5/ztp-site-generate-rhel8:v5.0" - name: "policy-generator-install" image: "registry.redhat.io/rhacm2/multicluster-operators-subscription-rhel9:v2.17" imagePullPolicy: "Always" diff --git a/telco-hub/configuration/reference-crs/required/gitops/get_ztp_installation.sh b/telco-hub/configuration/reference-crs/required/gitops/get_ztp_installation.sh index 37135043a..afc60c9a4 100755 --- a/telco-hub/configuration/reference-crs/required/gitops/get_ztp_installation.sh +++ b/telco-hub/configuration/reference-crs/required/gitops/get_ztp_installation.sh @@ -11,7 +11,7 @@ fi #CURRENT_OCP_VERSION=4.18 #ZTP_SITE_GENERATE_IMAGE=ztp-site-generate-rhel8:v${CURRENT_OCP_VERSION} -#podman run --log-driver=none --rm registry.redhat.io/openshift4/${ZTP_SITE_GENERATE_IMAGE=ztp-site-generate-rhel8} extract /home/ztp/argocd/deployment --tar | tar x -C "ztp-installation" +#podman run --log-driver=none --rm registry.redhat.io/openshift5/${ZTP_SITE_GENERATE_IMAGE=ztp-site-generate-rhel8} extract /home/ztp/argocd/deployment --tar | tar x -C "ztp-installation" rm ztp-installation/* cp ../../../../../telco-ran/configuration/argocd/deployment/* ztp-installation/ @@ -27,7 +27,7 @@ find ./ztp-installation/ -name "*.yaml" -exec yq -i eval '.metadata.annotations. # patch the ztp-site-generate version echo " - Patch ztp-site-generate version" -sedi 's|quay.io/openshift-kni/ztp-site-generator:latest|registry.redhat.io/openshift4/ztp-site-generate-rhel8:v4.21|g' ztp-installation/argocd-openshift-gitops-patch.json +sedi 's|quay.io/openshift-kni/ztp-site-generator:latest|registry.redhat.io/openshift5/ztp-site-generate-rhel8:v4.21|g' ztp-installation/argocd-openshift-gitops-patch.json echo " - Adding elements to the whitelist" yq '.spec.namespaceResourceWhitelist += {"group": "'metal3.io'", "kind": "DataImage"}' ztp-installation/app-project.yaml diff --git a/telco-hub/configuration/reference-crs/required/registry/idms-operator.yaml b/telco-hub/configuration/reference-crs/required/registry/idms-operator.yaml index 7b3da9af1..781ec578a 100644 --- a/telco-hub/configuration/reference-crs/required/registry/idms-operator.yaml +++ b/telco-hub/configuration/reference-crs/required/registry/idms-operator.yaml @@ -39,8 +39,8 @@ spec: - /rhacm2 source: registry.redhat.io/rhacm2 - mirrors: - - /openshift4 - source: registry.redhat.io/openshift4 + - /openshift5 + source: registry.redhat.io/openshift5 - mirrors: - /multicluster-engine/assisted-installer-agent-rhel9 source: registry.redhat.io/multicluster-engine/assisted-installer-agent-rhel9 diff --git a/telco-hub/configuration/reference-crs/required/registry/itms-generic.yaml b/telco-hub/configuration/reference-crs/required/registry/itms-generic.yaml index b4000a000..79950fc3e 100644 --- a/telco-hub/configuration/reference-crs/required/registry/itms-generic.yaml +++ b/telco-hub/configuration/reference-crs/required/registry/itms-generic.yaml @@ -15,8 +15,8 @@ spec: - /ubi8 source: registry.redhat.io/ubi8 - mirrors: - - /openshift4 - source: registry.redhat.io/openshift4 + - /openshift5 + source: registry.redhat.io/openshift5 - mirrors: - /rhel8 source: registry.redhat.io/rhel8 diff --git a/telco-hub/install/mirror-registry/imageset-config.yaml b/telco-hub/install/mirror-registry/imageset-config.yaml index 4088e7471..bd311b324 100644 --- a/telco-hub/install/mirror-registry/imageset-config.yaml +++ b/telco-hub/install/mirror-registry/imageset-config.yaml @@ -103,7 +103,7 @@ mirror: - name: stable-v1 additionalImages: - name: registry.redhat.io/ubi8/ubi:latest - - name: registry.redhat.io/openshift4/ztp-site-generate-rhel8:v4.22 + - name: registry.redhat.io/openshift5/ztp-site-generate-rhel8:v5.0 - name: registry.redhat.io/rhel8/support-tools:latest - name: registry.redhat.io/rhacm2/multicluster-operators-subscription-rhel9:v2.17.0-1 helm: {} From c21c05464d71ff25236123c29b31e4ee2a26842f Mon Sep 17 00:00:00 2001 From: Andres Gilgado Date: Tue, 18 Aug 2026 14:51:29 +0200 Subject: [PATCH 2/4] CNF-26586: Add openshift5 registry entries alongside openshift4 in mirror configs For mirror/registry configurations (IDMS, ITMS, ACM registries.conf), add openshift5 as a new entry while keeping the existing openshift4 entry. Direct image references remain updated to openshift5. Co-authored-by: Cursor --- .../acm/acmMirrorRegistryCM-patch.yaml | 8 ++++++++ .../registry/idms-operator-mirrors-patch.yaml | 3 +++ .../registry/itms-generic-mirrors-patch.yaml | 3 +++ .../reference-crs-kube-compare/default_value.yaml | 12 ++++++++++++ .../required/acm/acmMirrorRegistryCM.yaml | 6 ++++++ .../required/registry/idms-operator.yaml | 3 +++ .../required/registry/itms-generic.yaml | 3 +++ .../install/mirror-registry/imageset-config.yaml | 2 +- 8 files changed, 39 insertions(+), 1 deletion(-) diff --git a/telco-hub/configuration/example-overlays-config/acm/acmMirrorRegistryCM-patch.yaml b/telco-hub/configuration/example-overlays-config/acm/acmMirrorRegistryCM-patch.yaml index 415280d67..fc97e8b89 100644 --- a/telco-hub/configuration/example-overlays-config/acm/acmMirrorRegistryCM-patch.yaml +++ b/telco-hub/configuration/example-overlays-config/acm/acmMirrorRegistryCM-patch.yaml @@ -44,6 +44,14 @@ location = "/odf4" pull-from-mirror = "digest-only" + [[registry]] + prefix = "" + location = "registry.redhat.io/openshift4" + + [[registry.mirror]] + location = "/openshift4" + pull-from-mirror = "digest-only" + [[registry]] prefix = "" location = "registry.redhat.io/openshift5" diff --git a/telco-hub/configuration/example-overlays-config/registry/idms-operator-mirrors-patch.yaml b/telco-hub/configuration/example-overlays-config/registry/idms-operator-mirrors-patch.yaml index db023b8a7..8ea80b80c 100644 --- a/telco-hub/configuration/example-overlays-config/registry/idms-operator-mirrors-patch.yaml +++ b/telco-hub/configuration/example-overlays-config/registry/idms-operator-mirrors-patch.yaml @@ -29,6 +29,9 @@ - mirrors: - /rhacm2 source: registry.redhat.io/rhacm2 + - mirrors: + - /openshift4 + source: registry.redhat.io/openshift4 - mirrors: - /openshift5 source: registry.redhat.io/openshift5 diff --git a/telco-hub/configuration/example-overlays-config/registry/itms-generic-mirrors-patch.yaml b/telco-hub/configuration/example-overlays-config/registry/itms-generic-mirrors-patch.yaml index a27d344b7..4d49501d1 100644 --- a/telco-hub/configuration/example-overlays-config/registry/itms-generic-mirrors-patch.yaml +++ b/telco-hub/configuration/example-overlays-config/registry/itms-generic-mirrors-patch.yaml @@ -5,6 +5,9 @@ - mirrors: - /ubi8 source: registry.redhat.io/ubi8 + - mirrors: + - /openshift4 + source: registry.redhat.io/openshift4 - mirrors: - /openshift5 source: registry.redhat.io/openshift5 diff --git a/telco-hub/configuration/reference-crs-kube-compare/default_value.yaml b/telco-hub/configuration/reference-crs-kube-compare/default_value.yaml index 946d2a1ac..ae423879d 100644 --- a/telco-hub/configuration/reference-crs-kube-compare/default_value.yaml +++ b/telco-hub/configuration/reference-crs-kube-compare/default_value.yaml @@ -233,6 +233,12 @@ required_acm_acmMirrorRegistryCM: [[registry.mirror]] location = "/odf4" pull-from-mirror = "digest-only" + [[registry]] + prefix = "" + location = "registry.redhat.io/openshift4" + [[registry.mirror]] + location = "/openshift4" + pull-from-mirror = "digest-only" [[registry]] prefix = "" location = "registry.redhat.io/openshift5" @@ -384,6 +390,9 @@ required_registry_idms_operator: - mirrors: - /rhacm2 source: registry.redhat.io/rhacm2 + - mirrors: + - /openshift4 + source: registry.redhat.io/openshift4 - mirrors: - /openshift5 source: registry.redhat.io/openshift5 @@ -420,6 +429,9 @@ required_registry_itms_generic: - mirrors: - /ubi8 source: registry.redhat.io/ubi8 + - mirrors: + - /openshift4 + source: registry.redhat.io/openshift4 - mirrors: - /openshift5 source: registry.redhat.io/openshift5 diff --git a/telco-hub/configuration/reference-crs/required/acm/acmMirrorRegistryCM.yaml b/telco-hub/configuration/reference-crs/required/acm/acmMirrorRegistryCM.yaml index 42183115a..ca17c24ad 100644 --- a/telco-hub/configuration/reference-crs/required/acm/acmMirrorRegistryCM.yaml +++ b/telco-hub/configuration/reference-crs/required/acm/acmMirrorRegistryCM.yaml @@ -51,6 +51,12 @@ data: [[registry.mirror]] location = "/odf4" pull-from-mirror = "digest-only" + [[registry]] + prefix = "" + location = "registry.redhat.io/openshift4" + [[registry.mirror]] + location = "/openshift4" + pull-from-mirror = "digest-only" [[registry]] prefix = "" location = "registry.redhat.io/openshift5" diff --git a/telco-hub/configuration/reference-crs/required/registry/idms-operator.yaml b/telco-hub/configuration/reference-crs/required/registry/idms-operator.yaml index 781ec578a..6cc42a70d 100644 --- a/telco-hub/configuration/reference-crs/required/registry/idms-operator.yaml +++ b/telco-hub/configuration/reference-crs/required/registry/idms-operator.yaml @@ -38,6 +38,9 @@ spec: - mirrors: - /rhacm2 source: registry.redhat.io/rhacm2 + - mirrors: + - /openshift4 + source: registry.redhat.io/openshift4 - mirrors: - /openshift5 source: registry.redhat.io/openshift5 diff --git a/telco-hub/configuration/reference-crs/required/registry/itms-generic.yaml b/telco-hub/configuration/reference-crs/required/registry/itms-generic.yaml index 79950fc3e..e7d1d1843 100644 --- a/telco-hub/configuration/reference-crs/required/registry/itms-generic.yaml +++ b/telco-hub/configuration/reference-crs/required/registry/itms-generic.yaml @@ -14,6 +14,9 @@ spec: - mirrors: - /ubi8 source: registry.redhat.io/ubi8 + - mirrors: + - /openshift4 + source: registry.redhat.io/openshift4 - mirrors: - /openshift5 source: registry.redhat.io/openshift5 diff --git a/telco-hub/install/mirror-registry/imageset-config.yaml b/telco-hub/install/mirror-registry/imageset-config.yaml index bd311b324..dabc324ac 100644 --- a/telco-hub/install/mirror-registry/imageset-config.yaml +++ b/telco-hub/install/mirror-registry/imageset-config.yaml @@ -103,7 +103,7 @@ mirror: - name: stable-v1 additionalImages: - name: registry.redhat.io/ubi8/ubi:latest - - name: registry.redhat.io/openshift5/ztp-site-generate-rhel8:v5.0 + - name: registry.redhat.io/openshift5/ztp-site-generate-rhel9:v5.0 - name: registry.redhat.io/rhel8/support-tools:latest - name: registry.redhat.io/rhacm2/multicluster-operators-subscription-rhel9:v2.17.0-1 helm: {} From 33263d55cd4e0eb939ffd2ff153dd50c9c7c389a Mon Sep 17 00:00:00 2001 From: Andres Gilgado Date: Tue, 18 Aug 2026 14:54:19 +0200 Subject: [PATCH 3/4] CNF-26586: Fix ztp-site-generate refs to keep rhel8 and restore openshift4 for v4.21 Co-authored-by: Cursor --- .../reference-crs/required/gitops/get_ztp_installation.sh | 4 ++-- telco-hub/install/mirror-registry/imageset-config.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/telco-hub/configuration/reference-crs/required/gitops/get_ztp_installation.sh b/telco-hub/configuration/reference-crs/required/gitops/get_ztp_installation.sh index afc60c9a4..37135043a 100755 --- a/telco-hub/configuration/reference-crs/required/gitops/get_ztp_installation.sh +++ b/telco-hub/configuration/reference-crs/required/gitops/get_ztp_installation.sh @@ -11,7 +11,7 @@ fi #CURRENT_OCP_VERSION=4.18 #ZTP_SITE_GENERATE_IMAGE=ztp-site-generate-rhel8:v${CURRENT_OCP_VERSION} -#podman run --log-driver=none --rm registry.redhat.io/openshift5/${ZTP_SITE_GENERATE_IMAGE=ztp-site-generate-rhel8} extract /home/ztp/argocd/deployment --tar | tar x -C "ztp-installation" +#podman run --log-driver=none --rm registry.redhat.io/openshift4/${ZTP_SITE_GENERATE_IMAGE=ztp-site-generate-rhel8} extract /home/ztp/argocd/deployment --tar | tar x -C "ztp-installation" rm ztp-installation/* cp ../../../../../telco-ran/configuration/argocd/deployment/* ztp-installation/ @@ -27,7 +27,7 @@ find ./ztp-installation/ -name "*.yaml" -exec yq -i eval '.metadata.annotations. # patch the ztp-site-generate version echo " - Patch ztp-site-generate version" -sedi 's|quay.io/openshift-kni/ztp-site-generator:latest|registry.redhat.io/openshift5/ztp-site-generate-rhel8:v4.21|g' ztp-installation/argocd-openshift-gitops-patch.json +sedi 's|quay.io/openshift-kni/ztp-site-generator:latest|registry.redhat.io/openshift4/ztp-site-generate-rhel8:v4.21|g' ztp-installation/argocd-openshift-gitops-patch.json echo " - Adding elements to the whitelist" yq '.spec.namespaceResourceWhitelist += {"group": "'metal3.io'", "kind": "DataImage"}' ztp-installation/app-project.yaml diff --git a/telco-hub/install/mirror-registry/imageset-config.yaml b/telco-hub/install/mirror-registry/imageset-config.yaml index dabc324ac..bd311b324 100644 --- a/telco-hub/install/mirror-registry/imageset-config.yaml +++ b/telco-hub/install/mirror-registry/imageset-config.yaml @@ -103,7 +103,7 @@ mirror: - name: stable-v1 additionalImages: - name: registry.redhat.io/ubi8/ubi:latest - - name: registry.redhat.io/openshift5/ztp-site-generate-rhel9:v5.0 + - name: registry.redhat.io/openshift5/ztp-site-generate-rhel8:v5.0 - name: registry.redhat.io/rhel8/support-tools:latest - name: registry.redhat.io/rhacm2/multicluster-operators-subscription-rhel9:v2.17.0-1 helm: {} From cd5b36d57a2ce3694528d9d0d5f8a0da834fe8ec Mon Sep 17 00:00:00 2001 From: Andres Gilgado Date: Wed, 19 Aug 2026 18:14:28 +0200 Subject: [PATCH 4/4] CNF-26586: Remove openshift4 mirror entries from IDMS/ITMS configs Per review feedback, Hub RDS should only include mirrors for the needed release. Remove openshift4 entries from IDMS, ITMS, and kube-compare default_value configs, keeping only openshift5. ACM registries.conf retains both entries as it may need openshift4 when managing older clusters (tbd). Co-authored-by: Cursor --- .../registry/idms-operator-mirrors-patch.yaml | 3 --- .../registry/itms-generic-mirrors-patch.yaml | 3 --- .../reference-crs-kube-compare/default_value.yaml | 6 ------ .../reference-crs/required/registry/idms-operator.yaml | 3 --- .../reference-crs/required/registry/itms-generic.yaml | 3 --- 5 files changed, 18 deletions(-) diff --git a/telco-hub/configuration/example-overlays-config/registry/idms-operator-mirrors-patch.yaml b/telco-hub/configuration/example-overlays-config/registry/idms-operator-mirrors-patch.yaml index 8ea80b80c..db023b8a7 100644 --- a/telco-hub/configuration/example-overlays-config/registry/idms-operator-mirrors-patch.yaml +++ b/telco-hub/configuration/example-overlays-config/registry/idms-operator-mirrors-patch.yaml @@ -29,9 +29,6 @@ - mirrors: - /rhacm2 source: registry.redhat.io/rhacm2 - - mirrors: - - /openshift4 - source: registry.redhat.io/openshift4 - mirrors: - /openshift5 source: registry.redhat.io/openshift5 diff --git a/telco-hub/configuration/example-overlays-config/registry/itms-generic-mirrors-patch.yaml b/telco-hub/configuration/example-overlays-config/registry/itms-generic-mirrors-patch.yaml index 4d49501d1..a27d344b7 100644 --- a/telco-hub/configuration/example-overlays-config/registry/itms-generic-mirrors-patch.yaml +++ b/telco-hub/configuration/example-overlays-config/registry/itms-generic-mirrors-patch.yaml @@ -5,9 +5,6 @@ - mirrors: - /ubi8 source: registry.redhat.io/ubi8 - - mirrors: - - /openshift4 - source: registry.redhat.io/openshift4 - mirrors: - /openshift5 source: registry.redhat.io/openshift5 diff --git a/telco-hub/configuration/reference-crs-kube-compare/default_value.yaml b/telco-hub/configuration/reference-crs-kube-compare/default_value.yaml index ae423879d..01b49a6e2 100644 --- a/telco-hub/configuration/reference-crs-kube-compare/default_value.yaml +++ b/telco-hub/configuration/reference-crs-kube-compare/default_value.yaml @@ -390,9 +390,6 @@ required_registry_idms_operator: - mirrors: - /rhacm2 source: registry.redhat.io/rhacm2 - - mirrors: - - /openshift4 - source: registry.redhat.io/openshift4 - mirrors: - /openshift5 source: registry.redhat.io/openshift5 @@ -429,9 +426,6 @@ required_registry_itms_generic: - mirrors: - /ubi8 source: registry.redhat.io/ubi8 - - mirrors: - - /openshift4 - source: registry.redhat.io/openshift4 - mirrors: - /openshift5 source: registry.redhat.io/openshift5 diff --git a/telco-hub/configuration/reference-crs/required/registry/idms-operator.yaml b/telco-hub/configuration/reference-crs/required/registry/idms-operator.yaml index 6cc42a70d..781ec578a 100644 --- a/telco-hub/configuration/reference-crs/required/registry/idms-operator.yaml +++ b/telco-hub/configuration/reference-crs/required/registry/idms-operator.yaml @@ -38,9 +38,6 @@ spec: - mirrors: - /rhacm2 source: registry.redhat.io/rhacm2 - - mirrors: - - /openshift4 - source: registry.redhat.io/openshift4 - mirrors: - /openshift5 source: registry.redhat.io/openshift5 diff --git a/telco-hub/configuration/reference-crs/required/registry/itms-generic.yaml b/telco-hub/configuration/reference-crs/required/registry/itms-generic.yaml index e7d1d1843..79950fc3e 100644 --- a/telco-hub/configuration/reference-crs/required/registry/itms-generic.yaml +++ b/telco-hub/configuration/reference-crs/required/registry/itms-generic.yaml @@ -14,9 +14,6 @@ spec: - mirrors: - /ubi8 source: registry.redhat.io/ubi8 - - mirrors: - - /openshift4 - source: registry.redhat.io/openshift4 - mirrors: - /openshift5 source: registry.redhat.io/openshift5