fix onGKE to use the cluster location, as name may be registered (#907)

GoogleCloudPlatform · Oct 31, 2024 · 8ed7574 · 8ed7574
1 parent dcf7039
commit 8ed7574
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/detectors/gcp/detector_test.go b/detectors/gcp/detector_test.go
@@ -44,7 +44,7 @@ func TestCloudPlatformAppEngineStandard(t *testing.T) {
 
 func TestCloudPlatformGKE(t *testing.T) {
 	d := NewTestDetector(newFakeMetadataTransport(t,
-		"instance/attributes/cluster-name", "cluster-name",
+		"instance/attributes/cluster-location", "us-central-1a",
 	), &FakeOSProvider{
 		Vars: map[string]string{
 			k8sServiceHostEnv: "foo",

diff --git a/detectors/gcp/gke.go b/detectors/gcp/gke.go
@@ -39,7 +39,7 @@ func (d *Detector) onGKE() bool {
 	}
 	// If we are on k8s, make sure that we are actually on GKE, and not a
 	// different managed k8s platform.
-	_, err := d.GKEClusterName()
+	_, err := d.metadata.InstanceAttributeValueWithContext(context.TODO(), clusterLocationMetadataAttr)
 	return err == nil
 }