UPSTREAM: <carry>: openshift: Hardcode API group and annotations to m…

…achine.openshift.io

Once this is merged we can set the CAPI_GROUP in cao and drop this commit in upcoming releases.
https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/cloudprovider/clusterapi/clusterapi_controller.go#L45

cluster-autoscaler/cloudprovider/clusterapi/clusterapi_controller.go

@@ -40,7 +40,7 @@ import (
 const (
 	machineProviderIDIndex = "machineProviderIDIndex"
 	nodeProviderIDIndex    = "nodeProviderIDIndex"
-	defaultCAPIGroup       = "cluster.x-k8s.io"
+	defaultCAPIGroup       = "machine.openshift.io"
 	// CAPIGroupEnvVar contains the environment variable name which allows overriding defaultCAPIGroup.
 	CAPIGroupEnvVar = "CAPI_GROUP"
 )

cluster-autoscaler/cloudprovider/clusterapi/clusterapi_nodegroup.go

@@ -25,8 +25,8 @@ import (
 )
 
 const (
-	machineDeleteAnnotationKey = "cluster.k8s.io/delete-machine"
-	machineAnnotationKey       = "cluster.k8s.io/machine"
+	machineDeleteAnnotationKey = "machine.openshift.io/cluster-api-delete-machine"
+	machineAnnotationKey       = "machine.openshift.io/machine"
 	debugFormat                = "%s (min: %d, max: %d, replicas: %d)"
 )
 

cluster-autoscaler/cloudprovider/clusterapi/clusterapi_utils.go

@@ -25,8 +25,8 @@ import (
 )
 
 const (
-	nodeGroupMinSizeAnnotationKey = "cluster.k8s.io/cluster-api-autoscaler-node-group-min-size"
-	nodeGroupMaxSizeAnnotationKey = "cluster.k8s.io/cluster-api-autoscaler-node-group-max-size"
+	nodeGroupMinSizeAnnotationKey = "machine.openshift.io/cluster-api-autoscaler-node-group-min-size"
+	nodeGroupMaxSizeAnnotationKey = "machine.openshift.io/cluster-api-autoscaler-node-group-max-size"
 )
 
 var (