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..2ecb4610c 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,15 @@ - mirrors: - /ubi8 source: registry.redhat.io/ubi8 + - mirrors: + - /ubi9 + source: registry.redhat.io/ubi9 - mirrors: - /openshift5 source: registry.redhat.io/openshift5 - mirrors: - /rhel8 source: registry.redhat.io/rhel8 + - mirrors: + - /rhel9 + source: registry.redhat.io/rhel9 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 01b49a6e2..81bb6c1a1 100644 --- a/telco-hub/configuration/reference-crs-kube-compare/default_value.yaml +++ b/telco-hub/configuration/reference-crs-kube-compare/default_value.yaml @@ -275,6 +275,12 @@ required_acm_acmMirrorRegistryCM: [[registry.mirror]] location = "/ubi8" pull-from-mirror = "tag-only" + [[registry]] + prefix = "" + location = "registry.redhat.io/ubi9" + [[registry.mirror]] + location = "/ubi9" + pull-from-mirror = "tag-only" required_acm_observabilitySecret: - data: @@ -426,12 +432,18 @@ required_registry_itms_generic: - mirrors: - /ubi8 source: registry.redhat.io/ubi8 + - mirrors: + - /ubi9 + source: registry.redhat.io/ubi9 - mirrors: - /openshift5 source: registry.redhat.io/openshift5 - mirrors: - /rhel8 source: registry.redhat.io/rhel8 + - mirrors: + - /rhel9 + source: registry.redhat.io/rhel9 required_registry_itms_release: - spec: diff --git a/telco-hub/configuration/reference-crs/required/acm/acmMirrorRegistryCM.yaml b/telco-hub/configuration/reference-crs/required/acm/acmMirrorRegistryCM.yaml index ca17c24ad..f82358091 100644 --- a/telco-hub/configuration/reference-crs/required/acm/acmMirrorRegistryCM.yaml +++ b/telco-hub/configuration/reference-crs/required/acm/acmMirrorRegistryCM.yaml @@ -93,3 +93,9 @@ data: [[registry.mirror]] location = "/ubi8" pull-from-mirror = "tag-only" + [[registry]] + prefix = "" + location = "registry.redhat.io/ubi9" + [[registry.mirror]] + location = "/ubi9" + pull-from-mirror = "tag-only" diff --git a/telco-hub/configuration/reference-crs/required/gitops/addPluginsPolicy.yaml b/telco-hub/configuration/reference-crs/required/gitops/addPluginsPolicy.yaml index 193aadf20..61bbd815c 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/openshift5/ztp-site-generate-rhel8:v5.0" + image: "registry.redhat.io/openshift5/ztp-site-generate-rhel9: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..c62cd9b7a 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 @@ -9,9 +9,9 @@ fi # This script is only needed to create the ztp-installation manifest # once per each Minor version. -#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" +#CURRENT_OCP_VERSION=5.0 +#ZTP_SITE_GENERATE_IMAGE=ztp-site-generate-rhel9:v${CURRENT_OCP_VERSION} +#podman run --log-driver=none --rm registry.redhat.io/openshift5/${ZTP_SITE_GENERATE_IMAGE=ztp-site-generate-rhel9} 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-rhel9:v5.0|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/itms-generic.yaml b/telco-hub/configuration/reference-crs/required/registry/itms-generic.yaml index 79950fc3e..3f157c2ae 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,15 @@ spec: - mirrors: - /ubi8 source: registry.redhat.io/ubi8 + - mirrors: + - /ubi9 + source: registry.redhat.io/ubi9 - mirrors: - /openshift5 source: registry.redhat.io/openshift5 - mirrors: - /rhel8 source: registry.redhat.io/rhel8 + - mirrors: + - /rhel9 + source: registry.redhat.io/rhel9 diff --git a/telco-hub/install/mirror-registry/imageset-config.yaml b/telco-hub/install/mirror-registry/imageset-config.yaml index bd311b324..a83c1bf53 100644 --- a/telco-hub/install/mirror-registry/imageset-config.yaml +++ b/telco-hub/install/mirror-registry/imageset-config.yaml @@ -102,8 +102,8 @@ mirror: channels: - 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/rhel8/support-tools:latest + - name: registry.redhat.io/ubi9/ubi:latest + - name: registry.redhat.io/openshift5/ztp-site-generate-rhel9:v5.0 + - name: registry.redhat.io/rhel9/support-tools:latest - name: registry.redhat.io/rhacm2/multicluster-operators-subscription-rhel9:v2.17.0-1 helm: {}