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..fc97e8b89 100644 --- a/telco-hub/configuration/example-overlays-config/acm/acmMirrorRegistryCM-patch.yaml +++ b/telco-hub/configuration/example-overlays-config/acm/acmMirrorRegistryCM-patch.yaml @@ -52,6 +52,14 @@ location = "/openshift4" pull-from-mirror = "digest-only" + [[registry]] + prefix = "" + location = "registry.redhat.io/openshift5" + + [[registry.mirror]] + location = "/openshift5" + pull-from-mirror = "digest-only" + [[registry]] prefix = "" location = "registry.redhat.io/rhacm2" 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..01b49a6e2 100644 --- a/telco-hub/configuration/reference-crs-kube-compare/default_value.yaml +++ b/telco-hub/configuration/reference-crs-kube-compare/default_value.yaml @@ -239,6 +239,12 @@ required_acm_acmMirrorRegistryCM: [[registry.mirror]] location = "/openshift4" pull-from-mirror = "digest-only" + [[registry]] + prefix = "" + location = "registry.redhat.io/openshift5" + [[registry.mirror]] + location = "/openshift5" + pull-from-mirror = "digest-only" [[registry]] prefix = "" location = "registry.redhat.io/rhacm2" @@ -385,8 +391,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 +427,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..ca17c24ad 100644 --- a/telco-hub/configuration/reference-crs/required/acm/acmMirrorRegistryCM.yaml +++ b/telco-hub/configuration/reference-crs/required/acm/acmMirrorRegistryCM.yaml @@ -57,6 +57,12 @@ data: [[registry.mirror]] location = "/openshift4" pull-from-mirror = "digest-only" + [[registry]] + prefix = "" + location = "registry.redhat.io/openshift5" + [[registry.mirror]] + location = "/openshift5" + pull-from-mirror = "digest-only" [[registry]] prefix = "" location = "registry.redhat.io/rhacm2" 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/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: {}