From 4d97bb599bc93c73bb66e335af7e9f92a0587a44 Mon Sep 17 00:00:00 2001 From: ggn Date: Tue, 7 Jul 2026 11:16:10 -0400 Subject: [PATCH] Introduce base-rhel9 image and replace ubi-minimal references Add a managed base-rhel9 image (layered on ubi-minimal) so MCE images receive timely RPM updates without waiting for RHEL releases. Replace all runtime stream: rhel9 references with member: base-rhel9 across 31 component configs. console-mce is unchanged as it uses rhel-9-nodejs-24 as its runtime base. Ref: HYPBLD-854 Signed-off-by: Girish Nagaraj Co-authored-by: Cursor --- group.yml | 2 ++ images/addon-manager.yml | 2 +- images/azure-service-operator.yml | 2 +- images/backplane-must-gather.yml | 2 +- images/backplane-operator.yml | 2 +- images/base-rhel9.yml | 22 +++++++++++++++++++ images/capoa-bootstrap.yml | 2 +- images/capoa-control-plane.yml | 2 +- images/cluster-api-provider-agent.yml | 2 +- images/cluster-api-provider-aws.yml | 2 +- images/cluster-api-provider-azure.yml | 2 +- images/cluster-api-provider-kubevirt.yml | 2 +- images/cluster-api-webhook-config.yml | 2 +- images/cluster-curator-controller.yml | 2 +- images/cluster-image-set-controller.yml | 2 +- images/cluster-proxy.yml | 2 +- images/clusterclaims-controller.yml | 2 +- images/clusterlifecycle-state-metrics.yml | 2 +- images/discovery-operator.yml | 2 +- images/hive.yml | 2 +- images/hypershift-addon-operator.yml | 2 +- images/hypershift-cli.yml | 2 +- images/hypershift-release.yml | 2 +- images/image-based-install-operator.yml | 2 +- images/kube-rbac-proxy.yml | 2 +- images/managed-serviceaccount.yml | 2 +- ...managedcluster-import-controller-addon.yml | 2 +- images/multicloud-manager.yml | 2 +- images/placement.yml | 2 +- images/provider-credential-controller.yml | 2 +- images/registration-operator.yml | 2 +- images/registration.yml | 2 +- images/work.yml | 2 +- 33 files changed, 55 insertions(+), 31 deletions(-) create mode 100644 images/base-rhel9.yml diff --git a/group.yml b/group.yml index a60138f1c2..e6e1466688 100644 --- a/group.yml +++ b/group.yml @@ -66,6 +66,8 @@ public_upstreams: public: "https://github.com/openshift/image-based-install-operator" - private: "https://github.com/openshift-priv/cluster-api-provider-agent" public: "https://github.com/openshift/cluster-api-provider-agent" +- private: "https://github.com/openshift-priv/ocp-build-data" + public: "https://github.com/openshift-eng/ocp-build-data" urls: brewhub: https://brewhub.engineering.redhat.com/brewhub diff --git a/images/addon-manager.yml b/images/addon-manager.yml index 71f9a4524d..503d72bdf0 100644 --- a/images/addon-manager.yml +++ b/images/addon-manager.yml @@ -18,7 +18,7 @@ dependents: from: builder: - stream: rhel-9-golang - stream: rhel9 + member: base-rhel9 name: multicluster-engine/addon-manager-rhel9 owners: - acm-cicd@redhat.com diff --git a/images/azure-service-operator.yml b/images/azure-service-operator.yml index 458572a9ba..a889cd7039 100644 --- a/images/azure-service-operator.yml +++ b/images/azure-service-operator.yml @@ -35,7 +35,7 @@ enabled_repos: from: builder: - stream: rhel-9-golang-1.25 - stream: rhel9 + member: base-rhel9 name: multicluster-engine/azure-service-operator-rhel9 owners: - acm-cicd@redhat.com diff --git a/images/backplane-must-gather.yml b/images/backplane-must-gather.yml index 5cef4e3d9e..5dccdd10ca 100644 --- a/images/backplane-must-gather.yml +++ b/images/backplane-must-gather.yml @@ -21,7 +21,7 @@ enabled_repos: from: builder: - stream: ose-cli-rhel9 - stream: rhel9 + member: base-rhel9 name: multicluster-engine/backplane-must-gather-rhel9 owners: - acm-cicd@redhat.com diff --git a/images/backplane-operator.yml b/images/backplane-operator.yml index fd78208300..d2559a4dc0 100644 --- a/images/backplane-operator.yml +++ b/images/backplane-operator.yml @@ -21,7 +21,7 @@ from: builder: - stream: rhel9 - stream: rhel-9-golang - stream: rhel9 + member: base-rhel9 name: multicluster-engine/backplane-operator-rhel9 update-csv: name: multicluster-engine diff --git a/images/base-rhel9.yml b/images/base-rhel9.yml new file mode 100644 index 0000000000..33a75e42fb --- /dev/null +++ b/images/base-rhel9.yml @@ -0,0 +1,22 @@ +base_only: true +content: + source: + git: + branch: + target: openshift-base-rhel9 + url: git@github.com:openshift-priv/ocp-build-data.git + web: https://github.com/openshift-eng/ocp-build-data +distgit: + component: base-rhel9-container + branch: rhaos-{MAJOR}.{MINOR}-rhel-9 +enabled_repos: +- rhel-9-baseos-rpms +- rhel-9-appstream-rpms +for_payload: false +for_release: false +from: + stream: rhel9 +name: art-core/base-rhel9 +owners: +- aos-team-art@redhat.com +canonical_builders_from_upstream: false diff --git a/images/capoa-bootstrap.yml b/images/capoa-bootstrap.yml index 140b2dd3d5..2226708f6f 100644 --- a/images/capoa-bootstrap.yml +++ b/images/capoa-bootstrap.yml @@ -18,7 +18,7 @@ dependents: from: builder: - stream: rhel-9-golang-1.25 - stream: rhel9 + member: base-rhel9 name: multicluster-engine/capoa-bootstrap-rhel9 owners: - acm-cicd@redhat.com diff --git a/images/capoa-control-plane.yml b/images/capoa-control-plane.yml index b64009df2e..78cf6de25f 100644 --- a/images/capoa-control-plane.yml +++ b/images/capoa-control-plane.yml @@ -18,7 +18,7 @@ dependents: from: builder: - stream: rhel-9-golang-1.25 - stream: rhel9 + member: base-rhel9 name: multicluster-engine/capoa-control-plane-rhel9 owners: - acm-cicd@redhat.com diff --git a/images/cluster-api-provider-agent.yml b/images/cluster-api-provider-agent.yml index 0c978a4c3b..94819e1e4d 100644 --- a/images/cluster-api-provider-agent.yml +++ b/images/cluster-api-provider-agent.yml @@ -18,7 +18,7 @@ dependents: from: builder: - stream: rhel-9-golang-1.25 - stream: rhel9 + member: base-rhel9 name: multicluster-engine/cluster-api-provider-agent-rhel9 owners: - acm-cicd@redhat.com diff --git a/images/cluster-api-provider-aws.yml b/images/cluster-api-provider-aws.yml index c1dba8ef4d..f0c552c5f5 100644 --- a/images/cluster-api-provider-aws.yml +++ b/images/cluster-api-provider-aws.yml @@ -28,7 +28,7 @@ enabled_repos: from: builder: - stream: rhel-9-golang-1.25 - stream: rhel9 + member: base-rhel9 name: multicluster-engine/cluster-api-provider-aws-rhel9 owners: - acm-cicd@redhat.com diff --git a/images/cluster-api-provider-azure.yml b/images/cluster-api-provider-azure.yml index eed0dde144..e7c16fc945 100644 --- a/images/cluster-api-provider-azure.yml +++ b/images/cluster-api-provider-azure.yml @@ -18,7 +18,7 @@ dependents: from: builder: - stream: rhel-9-golang - stream: rhel9 + member: base-rhel9 name: multicluster-engine/cluster-api-provider-azure-rhel9 owners: - acm-cicd@redhat.com diff --git a/images/cluster-api-provider-kubevirt.yml b/images/cluster-api-provider-kubevirt.yml index 4df17506ad..c4deba0ad3 100644 --- a/images/cluster-api-provider-kubevirt.yml +++ b/images/cluster-api-provider-kubevirt.yml @@ -28,7 +28,7 @@ enabled_repos: from: builder: - stream: rhel-9-golang-1.25 - stream: rhel9 + member: base-rhel9 name: multicluster-engine/cluster-api-provider-kubevirt-rhel9 owners: - acm-cicd@redhat.com diff --git a/images/cluster-api-webhook-config.yml b/images/cluster-api-webhook-config.yml index 28ed933cad..8bc8275875 100644 --- a/images/cluster-api-webhook-config.yml +++ b/images/cluster-api-webhook-config.yml @@ -27,7 +27,7 @@ enabled_repos: from: builder: - stream: rhel-9-golang-1.25 - stream: rhel9 + member: base-rhel9 name: multicluster-engine/cluster-api-webhook-config-rhel9 owners: - acm-cicd@redhat.com diff --git a/images/cluster-curator-controller.yml b/images/cluster-curator-controller.yml index 4944c85982..a297d867c5 100644 --- a/images/cluster-curator-controller.yml +++ b/images/cluster-curator-controller.yml @@ -18,7 +18,7 @@ dependents: from: builder: - stream: rhel-9-golang - stream: rhel9 + member: base-rhel9 name: multicluster-engine/cluster-curator-controller-rhel9 owners: - acm-cicd@redhat.com diff --git a/images/cluster-image-set-controller.yml b/images/cluster-image-set-controller.yml index 167dd08c41..5642e4196c 100644 --- a/images/cluster-image-set-controller.yml +++ b/images/cluster-image-set-controller.yml @@ -18,7 +18,7 @@ dependents: from: builder: - stream: rhel-9-golang - stream: rhel9 + member: base-rhel9 name: multicluster-engine/cluster-image-set-controller-rhel9 owners: - acm-cicd@redhat.com diff --git a/images/cluster-proxy.yml b/images/cluster-proxy.yml index de131957bf..f50eca051a 100644 --- a/images/cluster-proxy.yml +++ b/images/cluster-proxy.yml @@ -18,7 +18,7 @@ dependents: from: builder: - stream: rhel-9-golang - stream: rhel9 + member: base-rhel9 name: multicluster-engine/cluster-proxy-rhel9 owners: - acm-cicd@redhat.com diff --git a/images/clusterclaims-controller.yml b/images/clusterclaims-controller.yml index eb69ed57d1..c988024849 100644 --- a/images/clusterclaims-controller.yml +++ b/images/clusterclaims-controller.yml @@ -18,7 +18,7 @@ dependents: from: builder: - stream: rhel-9-golang - stream: rhel9 + member: base-rhel9 name: multicluster-engine/clusterclaims-controller-rhel9 owners: - acm-cicd@redhat.com diff --git a/images/clusterlifecycle-state-metrics.yml b/images/clusterlifecycle-state-metrics.yml index 012ffaf327..29c50450d2 100644 --- a/images/clusterlifecycle-state-metrics.yml +++ b/images/clusterlifecycle-state-metrics.yml @@ -18,7 +18,7 @@ dependents: from: builder: - stream: rhel-9-golang - stream: rhel9 + member: base-rhel9 name: multicluster-engine/clusterlifecycle-state-metrics-rhel9 owners: - acm-cicd@redhat.com diff --git a/images/discovery-operator.yml b/images/discovery-operator.yml index 4d03d37937..bc19d6a1e5 100644 --- a/images/discovery-operator.yml +++ b/images/discovery-operator.yml @@ -21,7 +21,7 @@ enabled_repos: from: builder: - stream: rhel-9-golang-1.25 - stream: rhel9 + member: base-rhel9 name: multicluster-engine/discovery-operator-rhel9 owners: - acm-cicd@redhat.com diff --git a/images/hive.yml b/images/hive.yml index 0f9345027f..88499e1574 100644 --- a/images/hive.yml +++ b/images/hive.yml @@ -31,7 +31,7 @@ from: builder: - stream: rhel-8-golang-1.25 - stream: rhel-9-golang-1.25 - stream: rhel9 + member: base-rhel9 name: multicluster-engine/hive-rhel9 owners: - acm-cicd@redhat.com diff --git a/images/hypershift-addon-operator.yml b/images/hypershift-addon-operator.yml index 10b048dca5..ca827fb646 100644 --- a/images/hypershift-addon-operator.yml +++ b/images/hypershift-addon-operator.yml @@ -18,7 +18,7 @@ dependents: from: builder: - stream: rhel-9-golang - stream: rhel9 + member: base-rhel9 name: multicluster-engine/hypershift-addon-operator-rhel9 owners: - acm-cicd@redhat.com diff --git a/images/hypershift-cli.yml b/images/hypershift-cli.yml index 98e11e3173..1c4a6af335 100644 --- a/images/hypershift-cli.yml +++ b/images/hypershift-cli.yml @@ -18,7 +18,7 @@ dependents: from: builder: - stream: rhel-9-golang-1.25 - stream: rhel9 + member: base-rhel9 name: multicluster-engine/hypershift-cli-rhel9 owners: - acm-cicd@redhat.com diff --git a/images/hypershift-release.yml b/images/hypershift-release.yml index d2945efa06..794b19ba30 100644 --- a/images/hypershift-release.yml +++ b/images/hypershift-release.yml @@ -22,7 +22,7 @@ dependents: from: builder: - stream: rhel-9-golang-1.25 - stream: rhel9 + member: base-rhel9 name: multicluster-engine/hypershift-release-rhel9 owners: - acm-cicd@redhat.com diff --git a/images/image-based-install-operator.yml b/images/image-based-install-operator.yml index 2b771120f6..c663455df8 100644 --- a/images/image-based-install-operator.yml +++ b/images/image-based-install-operator.yml @@ -26,7 +26,7 @@ enabled_repos: from: builder: - stream: rhel-9-golang-1.25 - stream: rhel9 + member: base-rhel9 name: multicluster-engine/image-based-install-operator-rhel9 owners: - acm-cicd@redhat.com diff --git a/images/kube-rbac-proxy.yml b/images/kube-rbac-proxy.yml index c9ea0ef6bb..1079bd32c4 100644 --- a/images/kube-rbac-proxy.yml +++ b/images/kube-rbac-proxy.yml @@ -21,7 +21,7 @@ enabled_repos: from: builder: - stream: rhel-9-golang-1.25 - stream: rhel9 + member: base-rhel9 name: multicluster-engine/kube-rbac-proxy-rhel9 owners: - acm-cicd@redhat.com diff --git a/images/managed-serviceaccount.yml b/images/managed-serviceaccount.yml index d05166bb95..9c3346b5ec 100644 --- a/images/managed-serviceaccount.yml +++ b/images/managed-serviceaccount.yml @@ -21,7 +21,7 @@ enabled_repos: from: builder: - stream: rhel-9-golang-1.25 - stream: rhel9 + member: base-rhel9 name: multicluster-engine/managed-serviceaccount-rhel9 owners: - acm-cicd@redhat.com diff --git a/images/managedcluster-import-controller-addon.yml b/images/managedcluster-import-controller-addon.yml index 90311825e3..13a97c356e 100644 --- a/images/managedcluster-import-controller-addon.yml +++ b/images/managedcluster-import-controller-addon.yml @@ -18,7 +18,7 @@ dependents: from: builder: - stream: rhel-9-golang - stream: rhel9 + member: base-rhel9 name: multicluster-engine/managedcluster-import-controller-rhel9 owners: - acm-cicd@redhat.com diff --git a/images/multicloud-manager.yml b/images/multicloud-manager.yml index ac5e8e6135..0b41b150f6 100644 --- a/images/multicloud-manager.yml +++ b/images/multicloud-manager.yml @@ -18,7 +18,7 @@ dependents: from: builder: - stream: rhel-9-golang - stream: rhel9 + member: base-rhel9 name: multicluster-engine/multicloud-manager-rhel9 owners: - acm-cicd@redhat.com diff --git a/images/placement.yml b/images/placement.yml index 3552d6f018..3b502a0249 100644 --- a/images/placement.yml +++ b/images/placement.yml @@ -18,7 +18,7 @@ dependents: from: builder: - stream: rhel-9-golang - stream: rhel9 + member: base-rhel9 name: multicluster-engine/placement-rhel9 owners: - acm-cicd@redhat.com diff --git a/images/provider-credential-controller.yml b/images/provider-credential-controller.yml index ba097fb010..d0d196e903 100644 --- a/images/provider-credential-controller.yml +++ b/images/provider-credential-controller.yml @@ -18,7 +18,7 @@ dependents: from: builder: - stream: rhel-9-golang - stream: rhel9 + member: base-rhel9 name: multicluster-engine/provider-credential-controller-rhel9 owners: - acm-cicd@redhat.com diff --git a/images/registration-operator.yml b/images/registration-operator.yml index 598e8b7c59..a48d907c4f 100644 --- a/images/registration-operator.yml +++ b/images/registration-operator.yml @@ -18,7 +18,7 @@ dependents: from: builder: - stream: rhel-9-golang - stream: rhel9 + member: base-rhel9 name: multicluster-engine/registration-operator-rhel9 owners: - acm-cicd@redhat.com diff --git a/images/registration.yml b/images/registration.yml index b099795a5b..15c616ca8e 100644 --- a/images/registration.yml +++ b/images/registration.yml @@ -18,7 +18,7 @@ dependents: from: builder: - stream: rhel-9-golang - stream: rhel9 + member: base-rhel9 name: multicluster-engine/registration-rhel9 owners: - acm-cicd@redhat.com diff --git a/images/work.yml b/images/work.yml index 347717a6fb..3894f1b6c3 100644 --- a/images/work.yml +++ b/images/work.yml @@ -18,7 +18,7 @@ dependents: from: builder: - stream: rhel-9-golang - stream: rhel9 + member: base-rhel9 name: multicluster-engine/work-rhel9 owners: - acm-cicd@redhat.com