20:37 test

Author: huangchenzhao

cmd/yurthub/app/config/config.go

@@ -257,7 +257,8 @@ func createClientAndSharedInformers(options *options.YurtHubOptions) (kubernetes
 	var err error
 	// If yurthub is in local mode, create kubeconfig for host control plane to prepare	informerFactory.
 	if util.WorkingMode(options.WorkingMode) == util.WorkingModeLocal {
-		kubeConfig, err = clientcmd.BuildConfigFromFlags(fmt.Sprintf("http://%s", options.HostControlPlaneAddr), "")
+		kubeConfig, err = clientcmd.BuildConfigFromFlags("", "/root/ackkubeconfig")
+		// kubeConfig, err = clientcmd.BuildConfigFromFlags(fmt.Sprintf("http://%s", options.HostControlPlaneAddr), "")
 	} else {
 		kubeConfig, err = clientcmd.BuildConfigFromFlags(fmt.Sprintf("http://%s:%d", options.YurtHubProxyHost, options.YurtHubProxyPort), "")
 	}

pkg/yurtadm/cmd/join/phases/prepare.go

@@ -27,36 +27,37 @@ import (
 	"github.com/openyurtio/openyurt/pkg/yurtadm/util/edgenode"
 	yurtadmutil "github.com/openyurtio/openyurt/pkg/yurtadm/util/kubernetes"
 	"github.com/openyurtio/openyurt/pkg/yurtadm/util/localnode"
-	"github.com/openyurtio/openyurt/pkg/yurtadm/util/system"
 	"github.com/openyurtio/openyurt/pkg/yurtadm/util/yurthub"
 )
 
 // RunPrepare executes the node initialization process.
 func RunPrepare(data joindata.YurtJoinData) error {
 	// cleanup at first
-	staticPodsPath := filepath.Join(constants.KubeletConfigureDir, constants.ManifestsSubDirName)
-	if err := os.RemoveAll(staticPodsPath); err != nil {
-		klog.Warningf("remove %s: %v", staticPodsPath, err)
+	if data.NodeRegistration().WorkingMode != constants.LocalNode {
+		staticPodsPath := filepath.Join(constants.KubeletConfigureDir, constants.ManifestsSubDirName)
+		if err := os.RemoveAll(staticPodsPath); err != nil {
+			klog.Warningf("remove %s: %v", staticPodsPath, err)
+		}
 	}
 
-	if err := system.SetIpv4Forward(); err != nil {
-		return err
-	}
-	if err := system.SetBridgeSetting(); err != nil {
-		return err
-	}
-	if err := system.SetSELinux(); err != nil {
-		return err
-	}
-	if err := yurtadmutil.CheckAndInstallKubelet(data.KubernetesResourceServer(), data.KubernetesVersion()); err != nil {
-		return err
-	}
-	if err := yurtadmutil.CheckAndInstallKubeadm(data.KubernetesResourceServer(), data.KubernetesVersion()); err != nil {
-		return err
-	}
-	if err := yurtadmutil.CheckAndInstallKubernetesCni(data.ReuseCNIBin()); err != nil {
-		return err
-	}
+	// if err := system.SetIpv4Forward(); err != nil {
+	// 	return err
+	// }
+	// if err := system.SetBridgeSetting(); err != nil {
+	// 	return err
+	// }
+	// if err := system.SetSELinux(); err != nil {
+	// 	return err
+	// }
+	// if err := yurtadmutil.CheckAndInstallKubelet(data.KubernetesResourceServer(), data.KubernetesVersion()); err != nil {
+	// 	return err
+	// }
+	// if err := yurtadmutil.CheckAndInstallKubeadm(data.KubernetesResourceServer(), data.KubernetesVersion()); err != nil {
+	// 	return err
+	// }
+	// if err := yurtadmutil.CheckAndInstallKubernetesCni(data.ReuseCNIBin()); err != nil {
+	// 	return err
+	// }
 	if data.NodeRegistration().WorkingMode == constants.LocalNode {
 		// deploy systemd yurthub in local mode
 		if err := localnode.DeployYurthubInSystemd(data.HostControlPlaneAddr(), data.ServerAddr(), data.YurtHubBinary()); err != nil {
@@ -91,10 +92,10 @@ func RunPrepare(data joindata.YurtJoinData) error {
 			return err
 		}
 	}
-	if data.CfgPath() == "" {
-		if err := yurtadmutil.SetKubeadmJoinConfig(data); err != nil {
-			return err
-		}
-	}
+	// if data.CfgPath() == "" {
+	// 	if err := yurtadmutil.SetKubeadmJoinConfig(data); err != nil {
+	// 		return err
+	// 	}
+	// }
 	return nil
 }