From 1a2923dc35a9bef90ea4fc1efc55c82f177889ee Mon Sep 17 00:00:00 2001 From: Andrea Decorte Date: Fri, 5 Sep 2025 12:06:28 +0200 Subject: [PATCH] feat: add support for 'eus' channelGroupType in ROSA provider --- .../controlplane.cluster.x-k8s.io_rosacontrolplanes.yaml | 1 + controlplane/rosa/api/v1beta2/rosacontrolplane_types.go | 5 ++++- docs/book/src/topics/rosa/upgrades.md | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/config/crd/bases/controlplane.cluster.x-k8s.io_rosacontrolplanes.yaml b/config/crd/bases/controlplane.cluster.x-k8s.io_rosacontrolplanes.yaml index d9c269205a..e0c2f57080 100644 --- a/config/crd/bases/controlplane.cluster.x-k8s.io_rosacontrolplanes.yaml +++ b/config/crd/bases/controlplane.cluster.x-k8s.io_rosacontrolplanes.yaml @@ -87,6 +87,7 @@ spec: description: OpenShift version channel group, default is stable. enum: - stable + - eus - fast - candidate - nightly diff --git a/controlplane/rosa/api/v1beta2/rosacontrolplane_types.go b/controlplane/rosa/api/v1beta2/rosacontrolplane_types.go index 95d06281ff..c8a99cea6a 100644 --- a/controlplane/rosa/api/v1beta2/rosacontrolplane_types.go +++ b/controlplane/rosa/api/v1beta2/rosacontrolplane_types.go @@ -59,6 +59,9 @@ const ( // Stable channel group is the default channel group for stable releases. Stable ChannelGroupType = "stable" + // Eus channel group is for eus channel releases. + Eus ChannelGroupType = "eus" + // Fast channel group is for fast channel releases. Fast ChannelGroupType = "fast" @@ -110,7 +113,7 @@ type RosaControlPlaneSpec struct { //nolint: maligned // OpenShift version channel group, default is stable. // - // +kubebuilder:validation:Enum=stable;fast;candidate;nightly + // +kubebuilder:validation:Enum=stable;eus;fast;candidate;nightly // +kubebuilder:default=stable ChannelGroup ChannelGroupType `json:"channelGroup"` diff --git a/docs/book/src/topics/rosa/upgrades.md b/docs/book/src/topics/rosa/upgrades.md index 8eabf706ba..e12a4d1d83 100644 --- a/docs/book/src/topics/rosa/upgrades.md +++ b/docs/book/src/topics/rosa/upgrades.md @@ -11,7 +11,7 @@ When the versionGate is set to 'Acknowledge', it will revert to 'WaitForAcknowle The available upgrades versions for the `ROSAControlPlane` will be listed under `ROSAControlPlane.status.availableUpgrades` -The version channel group `ROSAControlPlane.spec.channelGroup` default to stable. However, it can be set to fast, candidate, or nightly. Changing the version channel group will change the `ROSAControlPlane.status.availableUpgrades` accordingly. Note that the use of channel groups other than stable may require additional permissions. +The version channel group `ROSAControlPlane.spec.channelGroup` defaults to stable. However, it can be set to eus, fast, candidate, or nightly. Changing the version channel group will change the `ROSAControlPlane.status.availableUpgrades` accordingly. Note that the use of channel groups other than stable may require additional permissions. The Upgrade state can be checked in the conditions under `ROSAControlPlane.status`.