Merge pull request #220 from elmiko/revert-capi-group

Bug 2045561: revert defaultCAPIGroup constant
openshift · Jan 26, 2022 · 25d3ad5 · 25d3ad5
2 parents 1998580 + 3f7eafa
commit 25d3ad5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/cluster-autoscaler/cloudprovider/clusterapi/clusterapi_controller.go b/cluster-autoscaler/cloudprovider/clusterapi/clusterapi_controller.go
@@ -44,7 +44,7 @@ import (
 const (
 	machineProviderIDIndex = "machineProviderIDIndex"
 	nodeProviderIDIndex    = "nodeProviderIDIndex"
-	defaultCAPIGroup       = "machine.openshift.io"
+	defaultCAPIGroup       = "cluster.x-k8s.io"
 	// CAPIGroupEnvVar contains the environment variable name which allows overriding defaultCAPIGroup.
 	CAPIGroupEnvVar               = "CAPI_GROUP"
 	resourceNameMachine           = "machines"

diff --git a/cluster-autoscaler/cloudprovider/clusterapi/clusterapi_utils_test.go b/cluster-autoscaler/cloudprovider/clusterapi/clusterapi_utils_test.go
@@ -911,6 +911,11 @@ func Test_clusterNameFromResource(t *testing.T) {
 }
 
 func Test_getKeyHelpers(t *testing.T) {
+	// unset the environment variable to ensure we get the default from the code
+	if err := os.Setenv(CAPIGroupEnvVar, ""); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
 	for _, tc := range []struct {
 		name     string
 		expected string