Merge pull request #1289 from FrancoisKlieberOrange/feat/gke-zonal-cluster-support

k8s-ci-robot · web-flow · commit 67ff6d8b42b7 · 2024-09-06T17:53:46.000+01:00
feat: gke zonal cluster support
diff --git a/cloud/scope/managedcontrolplane.go b/cloud/scope/managedcontrolplane.go
@@ -212,7 +212,7 @@ func (s *ManagedControlPlaneScope) Region() string {
 
 // ClusterLocation returns the location of the cluster.
 func (s *ManagedControlPlaneScope) ClusterLocation() string {
-	return fmt.Sprintf("projects/%s/locations/%s", s.GCPManagedControlPlane.Spec.Project, s.Region())
+	return fmt.Sprintf("projects/%s/locations/%s", s.GCPManagedControlPlane.Spec.Project, s.GCPManagedControlPlane.Spec.Location)
 }
 
 // ClusterFullName returns the full name of the cluster.

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ func (s *ManagedControlPlaneScope) Region() string {`
`212`	`212`
`213`	`213`	`// ClusterLocation returns the location of the cluster.`
`214`	`214`	`func (s *ManagedControlPlaneScope) ClusterLocation() string {`
`215`		`- return fmt.Sprintf("projects/%s/locations/%s", s.GCPManagedControlPlane.Spec.Project, s.Region())`
	`215`	`+ return fmt.Sprintf("projects/%s/locations/%s", s.GCPManagedControlPlane.Spec.Project, s.GCPManagedControlPlane.Spec.Location)`
`216`	`216`	`}`
`217`	`217`
`218`	`218`	`// ClusterFullName returns the full name of the cluster.`