From 020d48b40c19fa19dc104d4a469754de930f4ece Mon Sep 17 00:00:00 2001 From: shubham82 Date: Thu, 29 Jun 2023 12:25:29 +0530 Subject: [PATCH] Backport #5776 [cluster-autoscaler] "Change magnum to use control-plane role" into CA1.24 --- .../cloudprovider/magnum/magnum_cloud_provider.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cluster-autoscaler/cloudprovider/magnum/magnum_cloud_provider.go b/cluster-autoscaler/cloudprovider/magnum/magnum_cloud_provider.go index c48f54560c8d..0ed467d93f80 100644 --- 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 {