Merge pull request #838 from OrangeBao/release_v0.5.5

Cherry-Pick: don't create globalnodes for master

pkg/kubenest/controller/global.node.controller/global_node_controller.go

@@ -81,6 +81,16 @@ var CustomPredicateForGlobalNode = predicate.Funcs{
 	},
 }
 
+func isMasterNode(node *v1.Node) bool {
+	roles := []string{utils.LabelNodeRoleOldControlPlane, utils.LabelNodeRoleControlPlane}
+	for _, role := range roles {
+		if _, exists := node.Labels[role]; exists {
+			return true
+		}
+	}
+	return false
+}
+
 func (r *GlobalNodeController) SetupWithManager(mgr manager.Manager) error {
 	if r.Client == nil {
 		r.Client = mgr.GetClient()
@@ -253,6 +263,10 @@ func (r *GlobalNodeController) Reconcile(ctx context.Context, request reconcile.
 				klog.Errorf("global-node-controller: can not found root node: %s", request.Name)
 				return reconcile.Result{RequeueAfter: utils.DefaultRequeueTime}, nil
 			}
+			if isMasterNode(rootNode) {
+				klog.V(4).Infof("skip the master node: %s", request.Name)
+				return reconcile.Result{}, nil
+			}
 			globalNode.Name = request.Name
 			globalNode.Spec.State = v1alpha1.NodeReserved
 			firstNodeIP, err := utils.FindFirstNodeIPAddress(*rootNode, constants.PreferredAddressType)