Skip to content

Commit 1315831

Browse files
authored
Merge pull request #5587 from cblecker/fast-channel
✨ Add support for 'fast' channelGroupType in ROSA provider
2 parents 355a076 + 5bad56b commit 1315831

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

config/crd/bases/controlplane.cluster.x-k8s.io_rosacontrolplanes.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ spec:
8787
description: OpenShift version channel group, default is stable.
8888
enum:
8989
- stable
90+
- fast
9091
- candidate
9192
- nightly
9293
type: string

controlplane/rosa/api/v1beta2/rosacontrolplane_types.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ const (
5959
// Stable channel group is the default channel group for stable releases.
6060
Stable ChannelGroupType = "stable"
6161

62+
// Fast channel group is for fast channel releases.
63+
Fast ChannelGroupType = "fast"
64+
6265
// Candidate channel group is for testing candidate builds.
6366
Candidate ChannelGroupType = "candidate"
6467

@@ -107,7 +110,7 @@ type RosaControlPlaneSpec struct { //nolint: maligned
107110

108111
// OpenShift version channel group, default is stable.
109112
//
110-
// +kubebuilder:validation:Enum=stable;candidate;nightly
113+
// +kubebuilder:validation:Enum=stable;fast;candidate;nightly
111114
// +kubebuilder:default=stable
112115
ChannelGroup ChannelGroupType `json:"channelGroup"`
113116

docs/book/src/topics/rosa/upgrades.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44

55
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.
66

7-
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.
7+
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.
88

99
##### Note:
1010
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.
1111

1212
The available upgrades versions for the `ROSAControlPlane` will be listed under `ROSAControlPlane.status.availableUpgrades`
1313

14-
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.
14+
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.
1515

1616
The Upgrade state can be checked in the conditions under `ROSAControlPlane.status`.
1717

0 commit comments

Comments
 (0)