Feat/label driven yurtnode conversion

charts/yurt-manager/templates/yurt-manager-auto-generated.yaml

@@ -122,6 +122,12 @@ metadata:
 ---
 apiVersion: v1
 kind: ServiceAccount
+metadata:
+  name: yurt-manager-yurt-node-conversion-controller
+  namespace: {{ .Release.Namespace }}
+---
+apiVersion: v1
+kind: ServiceAccount
 metadata:
   name: yurt-manager-yurt-static-set-controller
   namespace: {{ .Release.Namespace }}
@@ -883,6 +889,44 @@ rules:
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
+metadata:
+  name: yurt-manager-yurt-node-conversion-controller
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - nodes
+  - nodes/status
+  verbs:
+  - get
+  - patch
+  - update
+- apiGroups:
+  - ""
+  resources:
+  - pods
+  verbs:
+  - get
+  - list
+- apiGroups:
+  - apps.openyurt.io
+  resources:
+  - nodepools
+  verbs:
+  - get
+- apiGroups:
+  - batch
+  resources:
+  - jobs
+  verbs:
+  - create
+  - delete
+  - get
+  - patch
+  - update
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
 metadata:
   name: yurt-manager-yurt-static-set-controller
 rules:
@@ -1186,6 +1230,19 @@ subjects:
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
+metadata:
+  name: yurt-manager-yurt-node-conversion-controller-binding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: yurt-manager-yurt-node-conversion-controller
+subjects:
+- kind: ServiceAccount
+  name: yurt-manager-yurt-node-conversion-controller
+  namespace: {{ .Release.Namespace }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
 metadata:
   name: yurt-manager-yurt-static-set-controller-binding
 roleRef:

cmd/yurt-manager/app/options/options.go

@@ -31,6 +31,7 @@ type YurtManagerOptions struct {
 	CsrApproverController        *CsrApproverControllerOptions
 	NodePoolController           *NodePoolControllerOptions
 	YurtStaticSetController      *YurtStaticSetControllerOptions
+	YurtNodeConversionController *YurtNodeConversionControllerOptions
 	YurtAppSetController         *YurtAppSetControllerOptions
 	PlatformAdminController      *PlatformAdminControllerOptions
 	NodeLifeCycleController      *NodeLifecycleControllerOptions
@@ -57,6 +58,7 @@ func NewYurtManagerOptions() (*YurtManagerOptions, error) {
 		CsrApproverController:        NewCsrApproverControllerOptions(),
 		NodePoolController:           NewNodePoolControllerOptions(),
 		YurtStaticSetController:      NewYurtStaticSetControllerOptions(),
+		YurtNodeConversionController: NewYurtNodeConversionControllerOptions(),
 		YurtAppSetController:         NewYurtAppSetControllerOptions(),
 		PlatformAdminController:      NewPlatformAdminControllerOptions(),
 		NodeLifeCycleController:      NewNodeLifecycleControllerOptions(),
@@ -85,6 +87,7 @@ func (y *YurtManagerOptions) Flags(allControllers, disabledByDefaultControllers
 	y.NodePoolController.AddFlags(fss.FlagSet("nodepool controller"))
 	y.YurtAppSetController.AddFlags(fss.FlagSet("yurtappset controller"))
 	y.YurtStaticSetController.AddFlags(fss.FlagSet("yurtstaticset controller"))
+	y.YurtNodeConversionController.AddFlags(fss.FlagSet("yurtnodeconversion controller"))
 	y.PlatformAdminController.AddFlags(fss.FlagSet("iot controller"))
 	y.NodeLifeCycleController.AddFlags(fss.FlagSet("nodelifecycle controller"))
 	y.NodeBucketController.AddFlags(fss.FlagSet("nodebucket controller"))
@@ -111,6 +114,7 @@ func (y *YurtManagerOptions) Validate(allControllers []string, controllerAliases
 	errs = append(errs, y.NodePoolController.Validate()...)
 	errs = append(errs, y.YurtAppSetController.Validate()...)
 	errs = append(errs, y.YurtStaticSetController.Validate()...)
+	errs = append(errs, y.YurtNodeConversionController.Validate()...)
 	errs = append(errs, y.PlatformAdminController.Validate()...)
 	errs = append(errs, y.NodeLifeCycleController.Validate()...)
 	errs = append(errs, y.NodeBucketController.Validate()...)
@@ -150,6 +154,9 @@ func (y *YurtManagerOptions) ApplyTo(c *config.Config, controllerAliases map[str
 	if err := y.YurtStaticSetController.ApplyTo(&c.ComponentConfig.YurtStaticSetController); err != nil {
 		return err
 	}
+	if err := y.YurtNodeConversionController.ApplyTo(&c.ComponentConfig.YurtNodeConversionController); err != nil {
+		return err
+	}
 	if err := y.PlatformAdminController.ApplyTo(&c.ComponentConfig.PlatformAdminController); err != nil {
 		return err
 	}

cmd/yurt-manager/app/options/yurtnodeconversioncontroller.go

@@ -0,0 +1,70 @@
+/*
+Copyright 2026 The OpenYurt Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package options
+
+import (
+	"fmt"
+
+	"github.com/spf13/pflag"
+
+	"github.com/openyurtio/openyurt/pkg/yurtmanager/controller/yurtnodeconversion/config"
+)
+
+type YurtNodeConversionControllerOptions struct {
+	*config.YurtNodeConversionControllerConfiguration
+}
+
+func NewYurtNodeConversionControllerOptions() *YurtNodeConversionControllerOptions {
+	return &YurtNodeConversionControllerOptions{
+		&config.YurtNodeConversionControllerConfiguration{
+			ConcurrentYurtNodeConversionWorkers: 3,
+		},
+	}
+}
+
+// AddFlags adds flags related to YurtNodeConversion for yurt-manager to the specified FlagSet.
+func (o *YurtNodeConversionControllerOptions) AddFlags(fs *pflag.FlagSet) {
+	if o == nil {
+		return
+	}
+
+	fs.Int32Var(&o.ConcurrentYurtNodeConversionWorkers, "concurrent-yurtnodeconversion-workers", o.ConcurrentYurtNodeConversionWorkers, "The number of node conversion objects that are allowed to reconcile concurrently. Larger number = more responsive conversion, but more CPU (and network) load")
+}
+
+// ApplyTo fills up YurtNodeConversion config with options.
+func (o *YurtNodeConversionControllerOptions) ApplyTo(cfg *config.YurtNodeConversionControllerConfiguration) error {
+	if o == nil {
+		return nil
+	}
+
+	cfg.ConcurrentYurtNodeConversionWorkers = o.ConcurrentYurtNodeConversionWorkers
+
+	return nil
+}
+
+// Validate checks validation of YurtNodeConversionControllerOptions.
+func (o *YurtNodeConversionControllerOptions) Validate() []error {
+	if o == nil {
+		return nil
+	}
+
+	errs := []error{}
+	if o.ConcurrentYurtNodeConversionWorkers <= 0 {
+		errs = append(errs, fmt.Errorf("concurrent-yurtnodeconversion-workers(%d) is invalid, should greater than 0", o.ConcurrentYurtNodeConversionWorkers))
+	}
+	return errs
+}

cmd/yurt-manager/names/controller_names.go

@@ -33,6 +33,7 @@ const (
 	GatewayDNSController                   = "gateway-dns-controller"
 	NodeLifeCycleController                = "node-life-cycle-controller"
 	NodeBucketController                   = "node-bucket-controller"
+	YurtNodeConversionController           = "yurt-node-conversion-controller"
 	LoadBalancerSetController              = "load-balancer-set-controller"
 	HubLeaderController                    = "hubleader-controller"
 	HubLeaderConfigController              = "hubleaderconfig-controller"
@@ -59,6 +60,7 @@ func YurtManagerControllerAliases() map[string]string {
 		"gatewaydns":                    GatewayDNSController,
 		"nodelifecycle":                 NodeLifeCycleController,
 		"nodebucket":                    NodeBucketController,
+		"yurtnodeconversion":            YurtNodeConversionController,
 		"loadbalancerset":               LoadBalancerSetController,
 		"hubleader":                     HubLeaderController,
 		"hubleaderconfig":               HubLeaderConfigController,

cmd/yurt-node-servant/convert/convert.go

@@ -31,18 +31,18 @@ import (
 func NewConvertCmd() *cobra.Command {
 	o := nodeconverter.NewConvertOptions()
 	cmd := &cobra.Command{
-		Use:   "convert --working-mode",
+		Use:   "convert",
 		Short: "",
 		Run: func(cmd *cobra.Command, args []string) {
 			fmt.Printf("node-servant version: %#v\n", projectinfo.Get())
-			if o.Version {
-				return
-			}
-
 			cmd.Flags().VisitAll(func(flag *pflag.Flag) {
 				klog.Infof("FLAG: --%s=%q", flag.Name, flag.Value)
 			})
 
+			if err := o.Complete(cmd.Flags()); err != nil {
+				klog.Fatalf("complete options: %v", err)
+			}
+
 			if err := o.Validate(); err != nil {
 				klog.Fatalf("validate options: %v", err)
 			}

cmd/yurt-node-servant/revert/revert.go

@@ -30,9 +30,12 @@ func NewRevertCmd() *cobra.Command {
 		Use:   "revert",
 		Short: "",
 		Run: func(cmd *cobra.Command, args []string) {
-			if err := o.Complete(cmd.Flags()); err != nil {
+			if err := o.Complete(); err != nil {
 				klog.Fatalf("could not complete the revert option: %s", err)
 			}
+			if err := o.Validate(); err != nil {
+				klog.Fatalf("could not validate the revert option: %s", err)
+			}
 
 			r := revert.NewReverterWithOptions(o)
 			if err := r.Do(); err != nil {
@@ -42,13 +45,7 @@ func NewRevertCmd() *cobra.Command {
 		},
 		Args: cobra.NoArgs,
 	}
-	setFlags(cmd)
 
+	o.AddFlags(cmd.Flags())
 	return cmd
 }
-
-// setFlags sets flags.
-func setFlags(cmd *cobra.Command) {
-	cmd.Flags().String("kubeadm-conf-path", "",
-		"The path to kubelet service conf that is used by kubelet component to join the cluster on the edge node.")
-}

hack/dockerfiles/build/Dockerfile.node-servant

@@ -5,5 +5,6 @@ ARG TARGETOS TARGETARCH MIRROR_REPO
 RUN if [ ! -z "${MIRROR_REPO+x}" ]; then sed -i "s/dl-cdn.alpinelinux.org/${MIRROR_REPO}/g" /etc/apk/repositories; fi && \
     apk add ca-certificates bash libc6-compat && update-ca-certificates && rm /var/cache/apk/*
 COPY ./_output/local/bin/${TARGETOS}/${TARGETARCH}/yurt-node-servant /usr/local/bin/node-servant
+COPY ./_output/local/bin/${TARGETOS}/${TARGETARCH}/yurthub /usr/local/bin/yurthub
 COPY hack/lib/node-servant-entry.sh /usr/local/bin/entry.sh
-RUN chmod +x /usr/local/bin/entry.sh
+RUN chmod +x /usr/local/bin/entry.sh

hack/dockerfiles/release/Dockerfile.node-servant

@@ -4,12 +4,18 @@ FROM --platform=${BUILDPLATFORM} golang:1.24.1 as builder
 ADD . /build
 ARG TARGETOS TARGETARCH IMAGE_TAG GOPROXY MIRROR_REPO
 WORKDIR /build/
-RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} IMAGE_TAG=${IMAGE_TAG} make build WHAT=cmd/yurt-node-servant
+RUN CGO_ENABLED=0 \
+    GOOS=${TARGETOS} \
+    GOARCH=${TARGETARCH} \
+    IMAGE_TAG=${IMAGE_TAG} \
+    make build WHAT="cmd/yurt-node-servant cmd/yurthub"
+
 
 FROM --platform=${TARGETPLATFORM} alpine:3.17
 ARG TARGETOS TARGETARCH MIRROR_REPO
 RUN if [ ! -z "${MIRROR_REPO+x}" ]; then sed -i "s/dl-cdn.alpinelinux.org/${MIRROR_REPO}/g" /etc/apk/repositories; fi && \
     apk add ca-certificates bash libc6-compat && update-ca-certificates && rm /var/cache/apk/*
 COPY --from=builder /build/_output/local/bin/${TARGETOS}/${TARGETARCH}/yurt-node-servant /usr/local/bin/node-servant
+COPY --from=builder /build/_output/local/bin/${TARGETOS}/${TARGETARCH}/yurthub /usr/local/bin/yurthub
 COPY hack/lib/node-servant-entry.sh /usr/local/bin/entry.sh
 RUN chmod +x /usr/local/bin/entry.sh

hack/lib/node-servant-entry.sh

@@ -22,8 +22,10 @@ fi
 
 mkdir -p /openyurt/usr/local/servant
 cp /usr/local/bin/node-servant /openyurt/usr/local/servant/
+if [ -f /usr/local/bin/yurthub ]; then
+    cp /usr/local/bin/yurthub /openyurt/usr/local/servant/
+fi
 
 chmod -R +x /openyurt/usr/local/servant/
 chroot /openyurt /usr/local/servant/node-servant "$@"
 rm -rf /openyurt/usr/local/servant
-

hack/make-rules/image_build.sh

@@ -30,7 +30,21 @@ readonly IMAGE_TARGETS=(
 
 http_proxy=${http_proxy:-}
 https_proxy=${https_proxy:-}
-targets=${@:-${IMAGE_TARGETS[@]}}
+targets=("$@")
+if [[ ${#targets[@]} -eq 0 ]]; then
+    targets=("${IMAGE_TARGETS[@]}")
+fi
+
+build_targets=("${targets[@]}")
+for target in "${targets[@]}"; do
+    if [[ ${target} == "yurt-node-servant" ]]; then
+        if [[ ! " ${build_targets[*]} " =~ " yurthub " ]]; then
+            build_targets+=("yurthub")
+        fi
+        break
+    fi
+done
+
 REGION=${REGION:-}
 IMAGE_REPO=${IMAGE_REPO:-"openyurt"}
 IMAGE_TAG=${IMAGE_TAG:-$(get_image_tag)}
@@ -88,7 +102,7 @@ docker run \
     --env GOCACHE=/tmp/ \
     ${DOCKER_EXTRA_ENVS} \
     ${BUILD_BASE_IMAGE} \
-    /bin/bash -c "git config --global --add safe.directory /build && GIT_VERSION=${GIT_VERSION} ./hack/make-rules/build.sh ${targets[@]}"
+    /bin/bash -c "git config --global --add safe.directory /build && GIT_VERSION=${GIT_VERSION} ./hack/make-rules/build.sh ${build_targets[*]}"
 
 # build images
 for image in ${targets[@]}; do

hack/make-rules/local-up-openyurt.sh

@@ -55,7 +55,6 @@ readonly REQUIRED_CMD=(
 readonly REQUIRED_IMAGES=(
     openyurt/node-servant
     openyurt/yurt-manager
-    openyurt/yurthub
     openyurt/yurt-iot-dock
 )
 

pkg/node-servant/components/kubelet.go

@@ -35,6 +35,7 @@ const (
 	apiserverAddrRegularExpression = "server: (http(s)?:\\/\\/)?[\\w][-\\w]{0,62}(\\.[\\w][-\\w]{0,62})*(:[\\d]{1,5})?"
 
 	kubeAdmFlagsEnvFile = "/var/lib/kubelet/kubeadm-flags.env"
+	fileMode            = 0666
 	dirMode             = 0755
 )