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 e9043004d3..9f68e97eae 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 + - fast - candidate - nightly type: string diff --git a/controlplane/rosa/api/v1beta2/rosacontrolplane_types.go b/controlplane/rosa/api/v1beta2/rosacontrolplane_types.go index b7bc7a5706..95d06281ff 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" + // Fast channel group is for fast channel releases. + Fast ChannelGroupType = "fast" + // Candidate channel group is for testing candidate builds. Candidate ChannelGroupType = "candidate" @@ -107,7 +110,7 @@ type RosaControlPlaneSpec struct { //nolint: maligned // OpenShift version channel group, default is stable. // - // +kubebuilder:validation:Enum=stable;candidate;nightly + // +kubebuilder:validation:Enum=stable;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 f668399d3f..8eabf706ba 100644 --- a/docs/book/src/topics/rosa/upgrades.md +++ b/docs/book/src/topics/rosa/upgrades.md @@ -4,14 +4,14 @@ Upgrading the OpenShift version of the control plane is supported by the provider. To perform an upgrade you need to update the `version` in the spec of the `ROSAControlPlane`. Once the version has changed the provider will handle the upgrade for you. -Upgrading y-stream version ex; v4.16.x to v4.17.x required the version gate acknowledgement. By default the versionGate is set to WaitForAcknowledge in the `ROSAControlPlane` CR. When upgrading to y-stream version the versionGate should be set to Acknowledge or AlwaysAcknowledge. +Upgrading y-stream version ex; v4.16.x to v4.17.x required the version gate acknowledgement. By default the versionGate is set to WaitForAcknowledge in the `ROSAControlPlane` CR. When upgrading to y-stream version the versionGate should be set to Acknowledge or AlwaysAcknowledge. ##### Note: When the versionGate is set to 'Acknowledge', it will revert to 'WaitForAcknowledge' once the upgrade is successfully completed. However, if the versionGate is set to 'AlwaysAcknowledge', it will remain set to 'AlwaysAcknowledge' after the upgrade is successfully completed. 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 candidate or nightly. Changing the version channel group will change the `ROSAControlPlane.status.availableUpgrades` accordingly. +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 Upgrade state can be checked in the conditions under `ROSAControlPlane.status`.