diff --git a/cluster-autoscaler/cloudprovider/clusterapi/clusterapi_controller.go b/cluster-autoscaler/cloudprovider/clusterapi/clusterapi_controller.go index a8d33652425c..a1847029fa35 100644 --- 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 index 3b99797a9bea..ff01b19b3a69 100644 --- 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