Stop adding kubernetes.azure.com/cluster label to unbounded-managed nodes

cmd/machina/machina/controller/ssh_integration_test.go

@@ -1106,7 +1106,7 @@ func TestProvisionMachine_ProviderLabelsOverride(t *testing.T) {
 		Client: fakeClient,
 		Scheme: s,
 		ClusterInfo: &ClusterInfo{
-			Provider: &cloudprovider.AKSProvider{ClusterName: "mc_rg_test_eastus"},
+			Provider: &cloudprovider.AKSProvider{},
 		},
 	}
 
@@ -1137,8 +1137,7 @@ func TestProvisionMachine_ProviderLabelsOverride(t *testing.T) {
 	// Provider label overrides user-specified value.
 	require.Equal(t, "false", agentConfig.Kubelet.Labels["kubernetes.azure.com/managed"])
 
-	// Provider label for cluster name is injected.
-	require.Equal(t, "mc_rg_test_eastus", agentConfig.Kubelet.Labels["kubernetes.azure.com/cluster"])
+	// kubernetes.azure.com/cluster label is no longer applied to unbounded-managed nodes.
 
 	// Common labels are always applied.
 	require.Equal(t, "true", agentConfig.Kubelet.Labels[cloudprovider.ExcludeFromCloudProviderLabel])

hack/agent/skills/unbounded-agent-qemu-vm-e2e/scripts/aks-config.sh

@@ -96,14 +96,8 @@ done <<< "$token_names"
 [[ -n "$token_id" && -n "$token_secret" ]] || die "no valid bootstrap token found in kube-system secrets"
 bootstrap_token="${token_id}.${token_secret}"
 
-# --- NODE RESOURCE GROUP (for Labels) ---
-cluster_rg=$(kubectl get nodes -o jsonpath='{.items[0].metadata.labels.kubernetes\.azure\.com/cluster}' 2>/dev/null) || true
-
 # --- Build labels JSON object ---
 labels_json="\"kubernetes.azure.com/managed\": \"false\""
-if [[ -n "$cluster_rg" ]]; then
-    labels_json+=", \"kubernetes.azure.com/cluster\": \"${cluster_rg}\""
-fi
 
 # --- Build taints JSON array ---
 # REGISTER_WITH_TAINTS is optional; split comma-separated entries into a JSON array.

internal/cloudprovider/provider.go

@@ -41,11 +41,7 @@ type Provider interface {
 }
 
 // AKSProvider implements Provider for Azure Kubernetes Service clusters.
-type AKSProvider struct {
-	// ClusterName is the value of the kubernetes.azure.com/cluster label
-	// read from a system-mode node.
-	ClusterName string
-}
+type AKSProvider struct{}
 
 func (p *AKSProvider) ID() string {
 	return "microsoft-aks"
@@ -54,7 +50,6 @@ func (p *AKSProvider) ID() string {
 func (p *AKSProvider) DefaultLabels() map[string]string {
 	return map[string]string{
 		"kubernetes.azure.com/managed": "false",
-		"kubernetes.azure.com/cluster": p.ClusterName,
 	}
 }
 
@@ -78,26 +73,5 @@ func DetectProvider(ctx context.Context, k kubernetes.Interface) (Provider, erro
 
 	logger.Info("AKS provider detected")
 
-	// Read the kubernetes.azure.com/cluster label from a system-mode node.
-	nodes, err := k.CoreV1().Nodes().List(ctx, metav1.ListOptions{
-		LabelSelector: "kubernetes.azure.com/mode=system",
-		Limit:         1,
-	})
-	if err != nil {
-		return nil, fmt.Errorf("list system-mode nodes: %w", err)
-	}
-
-	if len(nodes.Items) == 0 {
-		return nil, fmt.Errorf("AKS detected but no nodes found with label kubernetes.azure.com/mode=system")
-	}
-
-	clusterName, ok := nodes.Items[0].Labels["kubernetes.azure.com/cluster"]
-	if !ok || clusterName == "" {
-		return nil, fmt.Errorf("AKS detected but system-mode node %q is missing kubernetes.azure.com/cluster label",
-			nodes.Items[0].Name)
-	}
-
-	logger.Info("Resolved AKS cluster name", "clusterName", clusterName)
-
-	return &AKSProvider{ClusterName: clusterName}, nil
+	return &AKSProvider{}, nil
 }

internal/cloudprovider/provider_test.go

@@ -23,15 +23,6 @@ func TestDetectProvider_AKS(t *testing.T) {
 				Namespace: metav1.NamespacePublic,
 			},
 		},
-		&corev1.Node{
-			ObjectMeta: metav1.ObjectMeta{
-				Name: "aks-system-0",
-				Labels: map[string]string{
-					"kubernetes.azure.com/mode":    "system",
-					"kubernetes.azure.com/cluster": "mc_rg_my-cluster_eastus",
-				},
-			},
-		},
 	)
 
 	provider, err := DetectProvider(context.Background(), kubeCli)
@@ -41,7 +32,7 @@ func TestDetectProvider_AKS(t *testing.T) {
 
 	labels := provider.DefaultLabels()
 	require.Equal(t, "false", labels["kubernetes.azure.com/managed"])
-	require.Equal(t, "mc_rg_my-cluster_eastus", labels["kubernetes.azure.com/cluster"])
+	require.NotContains(t, labels, "kubernetes.azure.com/cluster")
 }
 
 func TestDetectProvider_NotAKS(t *testing.T) {
@@ -58,6 +49,8 @@ func TestDetectProvider_NotAKS(t *testing.T) {
 func TestDetectProvider_AKS_NoSystemNodes(t *testing.T) {
 	t.Parallel()
 
+	// AKS detection no longer requires system-mode nodes; only the
+	// aks-cluster-metadata ConfigMap is needed.
 	kubeCli := fake.NewClientset(
 		&corev1.ConfigMap{
 			ObjectMeta: metav1.ObjectMeta{
@@ -69,49 +62,23 @@ func TestDetectProvider_AKS_NoSystemNodes(t *testing.T) {
 	)
 
 	provider, err := DetectProvider(context.Background(), kubeCli)
-	require.Error(t, err)
-	require.Contains(t, err.Error(), "no nodes found")
-	require.Nil(t, provider)
+	require.NoError(t, err)
+	require.NotNil(t, provider)
+	require.Equal(t, "microsoft-aks", provider.ID())
 }
 
-func TestDetectProvider_AKS_MissingClusterLabel(t *testing.T) {
-	t.Parallel()
-
-	kubeCli := fake.NewClientset(
-		&corev1.ConfigMap{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      "aks-cluster-metadata",
-				Namespace: metav1.NamespacePublic,
-			},
-		},
-		&corev1.Node{
-			ObjectMeta: metav1.ObjectMeta{
-				Name: "aks-system-0",
-				Labels: map[string]string{
-					"kubernetes.azure.com/mode": "system",
-					// Missing kubernetes.azure.com/cluster label.
-				},
-			},
-		},
-	)
-
-	provider, err := DetectProvider(context.Background(), kubeCli)
-	require.Error(t, err)
-	require.Contains(t, err.Error(), "missing kubernetes.azure.com/cluster label")
-	require.Nil(t, provider)
-}
 
 func TestAKSProvider_DefaultLabels(t *testing.T) {
 	t.Parallel()
 
-	p := &AKSProvider{ClusterName: "mc_rg_test_eastus"}
+	p := &AKSProvider{}
 	require.Equal(t, "microsoft-aks", p.ID())
 
 	labels := p.DefaultLabels()
 
-	require.Len(t, labels, 2)
+	require.Len(t, labels, 1)
 	require.Equal(t, "false", labels["kubernetes.azure.com/managed"])
-	require.Equal(t, "mc_rg_test_eastus", labels["kubernetes.azure.com/cluster"])
+	require.NotContains(t, labels, "kubernetes.azure.com/cluster")
 }
 
 func TestCommonDefaultLabels(t *testing.T) {