mapNodeToServerID: strip any provider prefix #32962

previously we only stripped the brightbox:// prefix but would then go on to try
use any other providerIDs with the api. So instead, strip all provider prefixes
and trust the Brightbox API to be the authority on what is a brightbox server
and what is not.

This fixes using the provider with k3s, which uses a k3s:// provider prefix, but
should also work for future prefixes.

Author: johnl

brightbox/util.go

@@ -87,7 +87,15 @@ func mapNodeToServerID(node *v1.Node) string {
 	if node.Spec.ProviderID == "" {
 		return node.Name
 	}
-	return k8ssdk.MapProviderIDToServerID(node.Spec.ProviderID)
+
+	parts := strings.SplitN(node.Spec.ProviderID, "://", 2)
+
+	if len(parts) == 2 {
+		// some providers have 3 forward slashes so handle that
+		return strings.TrimPrefix(parts[1], "/")
+	}
+
+	return parts[0]
 }
 
 func mapServerIDToNode(name string) *v1.Node {

brightbox/util_test.go

@@ -91,6 +91,18 @@ func TestMapNodeToServerID(t *testing.T) {
 	if serverID != expected {
 		t.Errorf("Expected ServerID to be '%s', got '%s'", expected, serverID)
 	}
+	node = &v1.Node{Spec: v1.NodeSpec{ProviderID: "k3s://server789"}}
+	serverID = mapNodeToServerID(node)
+	expected = "server789"
+	if serverID != expected {
+		t.Errorf("Expected ServerID to be '%s', got '%s'", expected, serverID)
+	}
+	node = &v1.Node{Spec: v1.NodeSpec{ProviderID: "", Name: "server789"}}
+	serverID = mapNodeToServerID(node)
+	expected = "server789"
+	if serverID != expected {
+		t.Errorf("Expected ServerID to be '%s', got '%s'", expected, serverID)
+	}
 }
 
 // TestMapServerIDToNode verifies that a ServerID is correctly mapped to a Node with that ID as name