From 78198bf5a258e35f80019492fdc12e2a93496a9d Mon Sep 17 00:00:00 2001 From: Manyanda Chitimbo Date: Wed, 20 May 2026 18:24:31 +0200 Subject: [PATCH 1/3] chore: manual bump of CS to an image digest corresponding to commit sha 84b200b1d25eddb2d09ea820adcf5208e1de9779 To bring in the changes that's related to https://redhat.atlassian.net/browse/ARO-27209 See https://github.com/Azure/ARO-HCP/pull/5346 for an attempt to add e2e that will gate against the hypershift change --- config/config.yaml | 2 +- config/rendered/dev/ci01/centralus.yaml | 2 +- config/rendered/dev/cspr/westus3.yaml | 2 +- config/rendered/dev/dev/westus3.yaml | 2 +- config/rendered/dev/perf/westus3.yaml | 2 +- config/rendered/dev/pers/westus3.yaml | 2 +- config/rendered/dev/prow/centralus.yaml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/config/config.yaml b/config/config.yaml index ee2bdb7f8d1..c41ae54018a 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -944,7 +944,7 @@ defaults: image: registry: quay.io repository: app-sre/aro-hcp-clusters-service - digest: sha256:c7c3d1b499fbc29760eda173fa1a8c4eb2cd2b0aa3a872c7fe3aacfc2ff8abe5 # dbb022a3dd3f0533ae1c8eebd4e6929ba1ca1ede (2026-05-19 06:44) + digest: sha256:449827838d1e8d19a442ca470c86acfc206628345b1a4dea47c57cbd4865b7c9 # 84b200b1d25eddb2d09ea820adcf5208e1de9779 # controls how many HCPs can be placed on an MC, sadly not configurable per MC provisionShardClusterLimit: 100 provisionShardStatus: active diff --git a/config/rendered/dev/ci01/centralus.yaml b/config/rendered/dev/ci01/centralus.yaml index c174909a711..385f2636e13 100755 --- a/config/rendered/dev/ci01/centralus.yaml +++ b/config/rendered/dev/ci01/centralus.yaml @@ -163,7 +163,7 @@ clustersService: deployDebugJobs: false environment: arohcpci01 image: - digest: sha256:c7c3d1b499fbc29760eda173fa1a8c4eb2cd2b0aa3a872c7fe3aacfc2ff8abe5 + digest: sha256:449827838d1e8d19a442ca470c86acfc206628345b1a4dea47c57cbd4865b7c9 registry: quay.io repository: app-sre/aro-hcp-clusters-service k8s: diff --git a/config/rendered/dev/cspr/westus3.yaml b/config/rendered/dev/cspr/westus3.yaml index ce935eb474d..e2d5021173e 100755 --- a/config/rendered/dev/cspr/westus3.yaml +++ b/config/rendered/dev/cspr/westus3.yaml @@ -163,7 +163,7 @@ clustersService: deployDebugJobs: false environment: arohcpcspr image: - digest: sha256:c7c3d1b499fbc29760eda173fa1a8c4eb2cd2b0aa3a872c7fe3aacfc2ff8abe5 + digest: sha256:449827838d1e8d19a442ca470c86acfc206628345b1a4dea47c57cbd4865b7c9 registry: quay.io repository: app-sre/aro-hcp-clusters-service k8s: diff --git a/config/rendered/dev/dev/westus3.yaml b/config/rendered/dev/dev/westus3.yaml index 1e7ad320486..c406cbb0710 100755 --- a/config/rendered/dev/dev/westus3.yaml +++ b/config/rendered/dev/dev/westus3.yaml @@ -163,7 +163,7 @@ clustersService: deployDebugJobs: false environment: arohcpdev image: - digest: sha256:c7c3d1b499fbc29760eda173fa1a8c4eb2cd2b0aa3a872c7fe3aacfc2ff8abe5 + digest: sha256:449827838d1e8d19a442ca470c86acfc206628345b1a4dea47c57cbd4865b7c9 registry: quay.io repository: app-sre/aro-hcp-clusters-service k8s: diff --git a/config/rendered/dev/perf/westus3.yaml b/config/rendered/dev/perf/westus3.yaml index b7e26eadaba..812024b62bc 100755 --- a/config/rendered/dev/perf/westus3.yaml +++ b/config/rendered/dev/perf/westus3.yaml @@ -163,7 +163,7 @@ clustersService: deployDebugJobs: false environment: arohcpperf image: - digest: sha256:c7c3d1b499fbc29760eda173fa1a8c4eb2cd2b0aa3a872c7fe3aacfc2ff8abe5 + digest: sha256:449827838d1e8d19a442ca470c86acfc206628345b1a4dea47c57cbd4865b7c9 registry: quay.io repository: app-sre/aro-hcp-clusters-service k8s: diff --git a/config/rendered/dev/pers/westus3.yaml b/config/rendered/dev/pers/westus3.yaml index e612ff01789..9de2b2dc399 100755 --- a/config/rendered/dev/pers/westus3.yaml +++ b/config/rendered/dev/pers/westus3.yaml @@ -163,7 +163,7 @@ clustersService: deployDebugJobs: false environment: arohcppers image: - digest: sha256:c7c3d1b499fbc29760eda173fa1a8c4eb2cd2b0aa3a872c7fe3aacfc2ff8abe5 + digest: sha256:449827838d1e8d19a442ca470c86acfc206628345b1a4dea47c57cbd4865b7c9 registry: quay.io repository: app-sre/aro-hcp-clusters-service k8s: diff --git a/config/rendered/dev/prow/centralus.yaml b/config/rendered/dev/prow/centralus.yaml index 4a8ccc15862..87dbe28452e 100755 --- a/config/rendered/dev/prow/centralus.yaml +++ b/config/rendered/dev/prow/centralus.yaml @@ -163,7 +163,7 @@ clustersService: deployDebugJobs: false environment: arohcpprow image: - digest: sha256:c7c3d1b499fbc29760eda173fa1a8c4eb2cd2b0aa3a872c7fe3aacfc2ff8abe5 + digest: sha256:449827838d1e8d19a442ca470c86acfc206628345b1a4dea47c57cbd4865b7c9 registry: quay.io repository: app-sre/aro-hcp-clusters-service k8s: From 5aa58e747c154cb580b327783a1111c5a367a322 Mon Sep 17 00:00:00 2001 From: Manyanda Chitimbo Date: Thu, 21 May 2026 22:39:47 +0200 Subject: [PATCH 2/3] temp: pick up the nightly build in order to get the hypershift fix for NIC scheduling Pick the fix done in this PR https://github.com/openshift/hypershift/pull/8552 and test it against the CS bump to validate that it works end to end --- test/e2e/complete_cluster_create_multiversion.go | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/test/e2e/complete_cluster_create_multiversion.go b/test/e2e/complete_cluster_create_multiversion.go index 8dfe04c4c2c..4cbf3d37eb4 100644 --- a/test/e2e/complete_cluster_create_multiversion.go +++ b/test/e2e/complete_cluster_create_multiversion.go @@ -43,13 +43,19 @@ import ( var TestArtifactsFS embed.FS var _ = Describe("ARO-HCP", func() { - // Use channel group from environment variable, or default to stable - var channelGroup = framework.DefaultOpenshiftChannelGroup() - var nodePoolChannelGroup = framework.DefaultOpenshiftNodePoolChannelGroup() DescribeTable("should be able to perform a control plane and node pool install with OCP "+framework.DefaultOpenshiftChannelGroup()+" channel", func(ctx context.Context, version string) { + // Use channel group from environment variable, or default to stable + var channelGroup = framework.DefaultOpenshiftChannelGroup() + var nodePoolChannelGroup = framework.DefaultOpenshiftNodePoolChannelGroup() + if version == "4.23" || version == "5.0" { + // Nightly channel picks up the Hypershift fix for Swift NIC scheduling overrides + // (https://github.com/openshift/hypershift/pull/8552) and test it against the CS bump. + channelGroup = "nightly" + nodePoolChannelGroup = "nightly" + } customerNetworkSecurityGroupName := "customer-nsg-" + channelGroup + "-" customerVnetName := "customer-vnet-" + channelGroup + "-" customerVnetSubnetName := "customer-vnet-subnet-" + channelGroup + "-" @@ -61,6 +67,7 @@ var _ = Describe("ARO-HCP", func() { clusterParams := framework.NewDefaultClusterParams20251223() clusterParams.ClusterName = clusterName clusterParams.OpenshiftVersionId = version + clusterParams.ChannelGroup = channelGroup openShiftControlPlaneVersion, err := framework.GetLatestInstallVersion(ctx, clusterParams.ChannelGroup, version) if err != nil { if errors.Is(err, framework.ErrNightlyReleaseStreamNotFound) || errors.Is(err, framework.ErrNoAcceptedNightlyTags) || errors.Is(err, framework.ErrVersionNotFound) { @@ -147,6 +154,7 @@ var _ = Describe("ARO-HCP", func() { nodePoolParams := framework.NewDefaultNodePoolParams20240610() nodePoolParams.ClusterName = clusterName nodePoolParams.NodePoolName = nodePoolName + nodePoolParams.ChannelGroup = nodePoolChannelGroup // Calculate the node pool version configClient, err := configv1client.NewForConfig(adminRESTConfig) Expect(err).NotTo(HaveOccurred(), "failed to create OpenShift config client for cluster %q", clusterName) From adfd158498023c0c492e494538c0da6c6d6d8846 Mon Sep 17 00:00:00 2001 From: Manyanda Chitimbo Date: Wed, 27 May 2026 13:13:23 +0200 Subject: [PATCH 3/3] chore: unpin CS in the image bumper --- tooling/image-updater/config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling/image-updater/config.yaml b/tooling/image-updater/config.yaml index 9224dfb2f84..6611ee8b83e 100644 --- a/tooling/image-updater/config.yaml +++ b/tooling/image-updater/config.yaml @@ -47,7 +47,7 @@ images: group: cs source: image: quay.io/app-sre/aro-hcp-clusters-service - tag: "dbb022a3dd3f0533ae1c8eebd4e6929ba1ca1ede" # pinned: latest includes swift-nic annotation without CPO override (AROSLSRE-944, unpin: AROSLSRE-946) + tag: "latest" versionLabel: "vcs-ref" useAuth: true keyVault: