Skip to content

Bump cs to 84b200b #5382

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

Merged
openshift-merge-bot merged 3 commits into from
May 28, 2026
Merged

Bump cs to 84b200b #5382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
78198bf
chore: manual bump of CS to an image digest corresponding to commit s…
machi1990 May 20, 2026
5aa58e7
temp: pick up the nightly build in order to get the hypershift fix fo…
machi1990 May 21, 2026
adfd158
chore: unpin CS in the image bumper
machi1990 May 27, 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 config/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/rendered/dev/ci01/centralus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion config/rendered/dev/cspr/westus3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion config/rendered/dev/dev/westus3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion config/rendered/dev/perf/westus3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion config/rendered/dev/pers/westus3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion config/rendered/dev/prow/centralus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
14 changes: 11 additions & 3 deletions test/e2e/complete_cluster_create_multiversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Comment on lines +53 to +58
customerNetworkSecurityGroupName := "customer-nsg-" + channelGroup + "-"
customerVnetName := "customer-vnet-" + channelGroup + "-"
customerVnetSubnetName := "customer-vnet-subnet-" + channelGroup + "-"
Expand All @@ -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) {
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion tooling/image-updater/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down