Skip to content

CNF-26586: Update registry path from openshift4 to openshift5 #907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
by2waysprojects wants to merge 4 commits into
base: main
Choose a base branch
from
Open

CNF-26586: Update registry path from openshift4 to openshift5 #907

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3870e8c
CNF-26586: Update registry path from openshift4 to openshift5
by2waysprojects Aug 14, 2026
c21c054
CNF-26586: Add openshift5 registry entries alongside openshift4 in mi…
by2waysprojects Aug 18, 2026
33263d5
CNF-26586: Fix ztp-site-generate refs to keep rhel8 and restore opens…
by2waysprojects Aug 18, 2026
cd5b36d
CNF-26586: Remove openshift4 mirror entries from IDMS/ITMS configs
by2waysprojects Aug 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .tekton/build-pipeline-telco-core-rds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion .tekton/build-pipeline-telco-hub-rds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion telco-core/Dockerfile.telco-core
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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="" \
Expand Down
2 changes: 1 addition & 1 deletion telco-core/configuration/core-baseline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment thread
coderabbitai[bot] marked this conversation as resolved.
2 changes: 1 addition & 1 deletion telco-core/configuration/reference-crs/required/scheduling/sched.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion telco-hub/Dockerfile.telco-hub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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="" \
Expand Down
4 changes: 2 additions & 2 deletions telco-hub/configuration/example-overlays-config/acm/acmMirrorRegistryCM-patch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@

[[registry]]
prefix = ""
location = "registry.redhat.io/openshift4"
location = "registry.redhat.io/openshift5"

[[registry.mirror]]
location = "<registry.example.com:8443>/openshift4"
location = "<registry.example.com:8443>/openshift5"
pull-from-mirror = "digest-only"

Comment on lines +55 to +62

@imiller0 imiller0 Aug 19, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In other places we should limit to only openshift5 and remove the openshift4 entries. Here they may be required when ACM is managing an openshift4 cluster (tbd)

[[registry]]
Expand Down
4 changes: 2 additions & 2 deletions telco-hub/configuration/example-overlays-config/registry/idms-operator-mirrors-patch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
- <registry.example.com:8443>/rhacm2
source: registry.redhat.io/rhacm2
- mirrors:
- <registry.example.com:8443>/openshift4
source: registry.redhat.io/openshift4
- <registry.example.com:8443>/openshift5
source: registry.redhat.io/openshift5
Comment thread
by2waysprojects marked this conversation as resolved.
- mirrors:
- <registry.example.com:8443>/multicluster-engine/assisted-installer-agent-rhel9
source: registry.redhat.io/multicluster-engine/assisted-installer-agent-rhel9
4 changes: 2 additions & 2 deletions telco-hub/configuration/example-overlays-config/registry/itms-generic-mirrors-patch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
- <registry.example.com:8443>/ubi8
source: registry.redhat.io/ubi8
- mirrors:
- <registry.example.com:8443>/openshift4
source: registry.redhat.io/openshift4
- <registry.example.com:8443>/openshift5
source: registry.redhat.io/openshift5
Comment thread
by2waysprojects marked this conversation as resolved.
- mirrors:
- <registry.example.com:8443>/rhel8
source: registry.redhat.io/rhel8
12 changes: 6 additions & 6 deletions telco-hub/configuration/reference-crs-kube-compare/default_value.yaml
View file
Open in desktop

@imiller0 imiller0 Aug 19, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same, openshift5 only

@by2waysprojects by2waysprojects Aug 19, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

regarding

In other places we should limit to only openshift5 and remove the openshift4 entries. Here they may be required when ACM is managing an openshift4 cluster (tbd)

Should I add only the entry and not replace right? https://github.com/openshift-kni/telco-reference/pull/907/changes#diff-6e234dcd417e4995be309377f8b3d003281be4f2053ebfc7b234b56ee869f0a5R242

Original file line number Diff line number Diff line change
Expand Up @@ -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 = "<registry.example.com:8443>/openshift4"
location = "<registry.example.com:8443>/openshift5"
pull-from-mirror = "digest-only"
[[registry]]
prefix = ""
Expand Down Expand Up @@ -385,8 +385,8 @@ required_registry_idms_operator:
- <registry.example.com:8443>/rhacm2
source: registry.redhat.io/rhacm2
- mirrors:
- <registry.example.com:8443>/openshift4
source: registry.redhat.io/openshift4
- <registry.example.com:8443>/openshift5
source: registry.redhat.io/openshift5
- mirrors:
- <registry.example.com:8443>/multicluster-engine/assisted-installer-agent-rhel9
source: registry.redhat.io/multicluster-engine/assisted-installer-agent-rhel9
Expand Down Expand Up @@ -421,8 +421,8 @@ required_registry_itms_generic:
- <registry.example.com:8443>/ubi8
source: registry.redhat.io/ubi8
- mirrors:
- <registry.example.com:8443>/openshift4
source: registry.redhat.io/openshift4
- <registry.example.com:8443>/openshift5
source: registry.redhat.io/openshift5
- mirrors:
- <registry.example.com:8443>/rhel8
source: registry.redhat.io/rhel8
Expand Down
4 changes: 2 additions & 2 deletions telco-hub/configuration/reference-crs/required/acm/acmMirrorRegistryCM.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "<registry.example.com:8443>/openshift4"
location = "<registry.example.com:8443>/openshift5"
pull-from-mirror = "digest-only"
[[registry]]
prefix = ""
Expand Down
2 changes: 1 addition & 1 deletion telco-hub/configuration/reference-crs/required/gitops/addPluginsPolicy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions telco-hub/configuration/reference-crs/required/gitops/get_ztp_installation.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions telco-hub/configuration/reference-crs/required/registry/idms-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ spec:
- <registry.example.com:8443>/rhacm2
source: registry.redhat.io/rhacm2
- mirrors:
- <registry.example.com:8443>/openshift4
source: registry.redhat.io/openshift4
- <registry.example.com:8443>/openshift5
source: registry.redhat.io/openshift5
- mirrors:
- <registry.example.com:8443>/multicluster-engine/assisted-installer-agent-rhel9
source: registry.redhat.io/multicluster-engine/assisted-installer-agent-rhel9
4 changes: 2 additions & 2 deletions telco-hub/configuration/reference-crs/required/registry/itms-generic.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ spec:
- <registry.example.com:8443>/ubi8
source: registry.redhat.io/ubi8
- mirrors:
- <registry.example.com:8443>/openshift4
source: registry.redhat.io/openshift4
- <registry.example.com:8443>/openshift5
source: registry.redhat.io/openshift5
- mirrors:
- <registry.example.com:8443>/rhel8
source: registry.redhat.io/rhel8
2 changes: 1 addition & 1 deletion telco-hub/install/mirror-registry/imageset-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}
Loading