Fix upgrade check for version gate Ack

Signed-off-by: melserngawy <[email protected]>

Author: serngawy

controlplane/rosa/api/v1beta2/rosacontrolplane_types.go

@@ -38,7 +38,7 @@ const (
 	Private RosaEndpointAccessType = "Private"
 )
 
-// VersionGateAckType specifies the version gate acknowledgment.
+// VersionGateAckType specifies the version gate acknowledgement.
 type VersionGateAckType string
 
 const (
@@ -52,20 +52,6 @@ const (
 	AlwaysAcknowledge VersionGateAckType = "AlwaysAcknowledge"
 )
 
-// ChannelGroupType specifies the OpenShift version channel group.
-type ChannelGroupType string
-
-const (
-	// Stable channel group is the default channel group for stable releases.
-	Stable ChannelGroupType = "stable"
-
-	// Candidate channel group is for testing candidate builds.
-	Candidate ChannelGroupType = "candidate"
-
-	// Nightly channel group is for testing nigtly builds.
-	Nightly ChannelGroupType = "nightly"
-)
-
 // RosaControlPlaneSpec defines the desired state of ROSAControlPlane.
 type RosaControlPlaneSpec struct { //nolint: maligned
 	// Cluster name must be valid DNS-1035 label, so it must consist of lower case alphanumeric
@@ -105,12 +91,6 @@ type RosaControlPlaneSpec struct { //nolint: maligned
 	// OpenShift semantic version, for example "4.14.5".
 	Version string `json:"version"`
 
-	// OpenShift version channel group, default is stable.
-	//
-	// +kubebuilder:validation:Enum=stable;candidate;nightly
-	// +kubebuilder:default=stable
-	ChannelGroup ChannelGroupType `json:"channelGroup"`
-
 	// VersionGate requires acknowledgment when upgrading ROSA-HCP y-stream versions (e.g., from 4.15 to 4.16).
 	// Default is WaitForAcknowledge.
 	// WaitForAcknowledge: If acknowledgment is required, the upgrade will not proceed until VersionGate is set to Acknowledge or AlwaysAcknowledge.
@@ -749,10 +729,6 @@ type RosaControlPlaneStatus struct {
 	// OIDCEndpointURL is the endpoint url for the managed OIDC provider.
 	OIDCEndpointURL string `json:"oidcEndpointURL,omitempty"`
 
-	// OpenShift semantic version, for example "4.14.5".
-	// +optional
-	Version string `json:"version"`
-
 	// Available upgrades for the ROSA hosted control plane.
 	AvailableUpgrades []string `json:"availableUpgrades,omitempty"`
 }

pkg/rosa/versions.go

@@ -27,7 +27,7 @@ func CheckExistingScheduledUpgrade(client OCMClient, cluster *cmv1.Cluster) (*cm
 }
 
 // ScheduleControlPlaneUpgrade schedules a new control plane upgrade to the specified version at the specified time.
-func ScheduleControlPlaneUpgrade(client OCMClient, cluster *cmv1.Cluster, version string, nextRun time.Time, ack bool) (*cmv1.ControlPlaneUpgradePolicy, error) {
+func ScheduleControlPlaneUpgrade(client *ocm.Client, cluster *cmv1.Cluster, version string, nextRun time.Time, ack bool) (*cmv1.ControlPlaneUpgradePolicy, error) {
 	// earliestNextRun is set to at least 5 min from now by the OCM API.
 	// Set our next run request to something slightly longer than 5min to make sure we account for the latency between when we send this
 	// request and when the server processes it.
@@ -53,7 +53,7 @@ func ScheduleControlPlaneUpgrade(client OCMClient, cluster *cmv1.Cluster, versio
 	}
 
 	if !ack && len(versionGates) > 0 {
-		errMess := "version gate acknowledgment required"
+		errMess := "version gate acknowledgement required"
 		for id := range versionGates {
 			errMess = fmt.Sprintf(errMess+"\nid:%s\n %s\n %s\n %s\n", versionGates[id].ID(), versionGates[id].Description(), versionGates[id].DocumentationURL(), versionGates[id].WarningMessage())
 		}