Merge pull request #5907 from Shubham82/cherry-picked-of-#5776-upstre…

…am-cluster-autoscaler-release-1.24 Backport #5776 [cluster-autoscaler] "Change magnum to use control-plane role" into CA1.24
kubernetes · Jul 3, 2023 · 795fe41 · 795fe41
2 parents f460f9b + 020d48b
commit 795fe41
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/cluster-autoscaler/cloudprovider/magnum/magnum_cloud_provider.go b/cluster-autoscaler/cloudprovider/magnum/magnum_cloud_provider.go
@@ -117,6 +117,10 @@ func (mcp *magnumCloudProvider) NodeGroupForNode(node *apiv1.Node) (cloudprovide
 	if _, found := node.ObjectMeta.Labels["node-role.kubernetes.io/master"]; found {
 		return nil, nil
 	}
+	// Ignore control-plane nodes
+	if _, found := node.ObjectMeta.Labels["node-role.kubernetes.io/control-plane"]; found {
+		return nil, nil
+	}
 
 	ngUUID, err := mcp.magnumManager.nodeGroupForNode(node)
 	if err != nil {