Merge pull request #1498 from afarbos/af/ExtendedRC

k8s-ci-robot · web-flow · commit 23ac46dcebce · 2025-08-21T15:35:05.000-07:00
feat: add support for extended release channel
diff --git a/cloud/services/container/clusters/reconcile.go b/cloud/services/container/clusters/reconcile.go
@@ -386,6 +386,8 @@ func convertToSdkReleaseChannel(channel *infrav1exp.ReleaseChannel) containerpb.
 		return containerpb.ReleaseChannel_REGULAR
 	case infrav1exp.Stable:
 		return containerpb.ReleaseChannel_STABLE
+	case infrav1exp.Extended:
+		return containerpb.ReleaseChannel_EXTENDED
 	default:
 		return containerpb.ReleaseChannel_UNSPECIFIED
 	}
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmanagedcontrolplanes.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmanagedcontrolplanes.yaml
@@ -230,6 +230,7 @@ spec:
                 - rapid
                 - regular
                 - stable
+                - extended
                 type: string
               version:
                 description: |-
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmanagedcontrolplanetemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmanagedcontrolplanetemplates.yaml
@@ -187,6 +187,7 @@ spec:
                         - rapid
                         - regular
                         - stable
+                        - extended
                         type: string
                     required:
                     - location
diff --git a/exp/api/v1beta1/gcpmanagedcontrolplane_types.go b/exp/api/v1beta1/gcpmanagedcontrolplane_types.go
@@ -203,7 +203,7 @@ type GCPManagedControlPlaneList struct {
 }
 
 // ReleaseChannel is the release channel of the GKE cluster
-// +kubebuilder:validation:Enum=rapid;regular;stable
+// +kubebuilder:validation:Enum=rapid;regular;stable;extended
 type ReleaseChannel string
 
 const (
@@ -213,6 +213,8 @@ const (
 	Regular ReleaseChannel = "regular"
 	// Stable release channel.
 	Stable ReleaseChannel = "stable"
+	// Extended release channel.
+	Extended ReleaseChannel = "extended"
 )
 
 // MasterAuthorizedNetworksConfig contains configuration options for the master authorized networks feature.

Original file line number	Diff line number	Diff line change
`@@ -386,6 +386,8 @@ func convertToSdkReleaseChannel(channel *infrav1exp.ReleaseChannel) containerpb.`
`386`	`386`	`return containerpb.ReleaseChannel_REGULAR`
`387`	`387`	`case infrav1exp.Stable:`
`388`	`388`	`return containerpb.ReleaseChannel_STABLE`
	`389`	`+ case infrav1exp.Extended:`
	`390`	`+ return containerpb.ReleaseChannel_EXTENDED`
`389`	`391`	`default:`
`390`	`392`	`return containerpb.ReleaseChannel_UNSPECIFIED`
`391`	`393`	`}`
Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ type GCPManagedControlPlaneList struct {`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`// ReleaseChannel is the release channel of the GKE cluster`
`206`		`-// +kubebuilder:validation:Enum=rapid;regular;stable`
	`206`	`+// +kubebuilder:validation:Enum=rapid;regular;stable;extended`
`207`	`207`	`type ReleaseChannel string`
`208`	`208`
`209`	`209`	`const (`
`@@ -213,6 +213,8 @@ const (`
`213`	`213`	`Regular ReleaseChannel = "regular"`
`214`	`214`	`// Stable release channel.`
`215`	`215`	`Stable ReleaseChannel = "stable"`
	`216`	`+ // Extended release channel.`
	`217`	`+ Extended ReleaseChannel = "extended"`
`216`	`218`	`)`
`217`	`219`
`218`	`220`	`// MasterAuthorizedNetworksConfig contains configuration options for the master authorized networks feature.`