fix(clusterapi): HasInstance with namespace prefix

Author: mweibel

cluster-autoscaler/cloudprovider/clusterapi/clusterapi_provider.go

@@ -18,6 +18,7 @@ package clusterapi
 
 import (
 	"fmt"
+	"path"
 	"reflect"
 
 	corev1 "k8s.io/api/core/v1"
@@ -86,8 +87,9 @@ func (p *provider) NodeGroupForNode(node *corev1.Node) (cloudprovider.NodeGroup,
 // HasInstance returns whether a given node has a corresponding instance in this cloud provider
 func (p *provider) HasInstance(node *corev1.Node) (bool, error) {
 	machineID := node.Annotations[machineAnnotationKey]
+	ns := node.Annotations[clusterNamespaceAnnotationKey]
 
-	machine, err := p.controller.findMachine(machineID)
+	machine, err := p.controller.findMachine(path.Join(ns, machineID))
 	if machine != nil {
 		return true, nil
 	}

cluster-autoscaler/cloudprovider/clusterapi/clusterapi_utils.go

@@ -90,6 +90,10 @@ var (
 	// by the CAPI_GROUP env variable, it is initialized here.
 	machineAnnotationKey = getMachineAnnotationKey()
 
+	// clusterNamespaceAnnotationKey is the annotation used by cluster-api for annotating nodes
+	// with their cluster namespace.
+	clusterNamespaceAnnotationKey = getClusterNamespaceAnnotationKey()
+
 	// nodeGroupMinSizeAnnotationKey and nodeGroupMaxSizeAnnotationKey are the keys
 	// used in MachineSet and MachineDeployment annotations to specify the limits
 	// for the node group. Because the keys can be affected by the CAPI_GROUP env
@@ -308,6 +312,13 @@ func getMachineAnnotationKey() string {
 	return key
 }
 
+// getClusterNamespaceAnnotationKey returns the key that is used by cluster-api for annotating nodes
+// with their cluster namespace.
+func getClusterNamespaceAnnotationKey() string {
+	key := fmt.Sprintf("%s/cluster-namespace", getCAPIGroup())
+	return key
+}
+
 // getClusterNameLabel returns the key that is used by cluster-api for labeling
 // which cluster an object belongs to. This function is needed because the user can change
 // the default group name by using the CAPI_GROUP environment variable.