From 667e54cd6b35a5e7afdbddeba05d947676019e6a Mon Sep 17 00:00:00 2001
From: cuisongliu <cuisongliu@qq.com>
Date: Thu, 28 Apr 2022 22:39:28 +0800
Subject: [PATCH] feature(main): fix #960 for controller and schedule bind
 0.0.0.0

---
 pkg/runtime/default_kubeadm_config.go | 5 +++--
 pkg/runtime/init.go                   | 2 +-
 pkg/runtime/kubeadm.go                | 4 ++--
 pkg/runtime/kubeadm_config.go         | 4 ++--
 pkg/runtime/master.go                 | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkg/runtime/default_kubeadm_config.go b/pkg/runtime/default_kubeadm_config.go
index 666ffa271e7..7685f34194b 100644
--- a/pkg/runtime/default_kubeadm_config.go
+++ b/pkg/runtime/default_kubeadm_config.go
@@ -15,8 +15,7 @@
 package runtime
 
 const (
-	DefaultKubeadmConfig = `
-apiVersion: kubeadm.k8s.io/v1beta2
+	DefaultKubeadmConfig = `apiVersion: kubeadm.k8s.io/v1beta2
 kind: InitConfiguration
 localAPIEndpoint:
   # advertiseAddress: 192.168.2.110
@@ -66,6 +65,7 @@ apiServer:
       pathType: File
 controllerManager:
   extraArgs:
+    bind-address: 0.0.0.0
     feature-gates: TTLAfterFinished=true,EphemeralContainers=true
     experimental-cluster-signing-duration: 876000h
   extraVolumes:
@@ -76,6 +76,7 @@ controllerManager:
       pathType: File
 scheduler:
   extraArgs:
+    bind-address: 0.0.0.0
     feature-gates: TTLAfterFinished=true,EphemeralContainers=true
   extraVolumes:
     - hostPath: /etc/localtime
diff --git a/pkg/runtime/init.go b/pkg/runtime/init.go
index d18635bb847..054f9e33453 100644
--- a/pkg/runtime/init.go
+++ b/pkg/runtime/init.go
@@ -28,7 +28,7 @@ func (k *KubeadmRuntime) ConfigInitKubeadmToMaster0() error {
 	logger.Info("start to copy kubeadm config to master0")
 	data, err := k.generateInitConfigs()
 	if err != nil {
-		return fmt.Errorf("generator config init kubeadm Config error: %s", err.Error())
+		return fmt.Errorf("generator config init kubeadm config error: %s", err.Error())
 	}
 	initConfigPath := path.Join(k.getContentData().TmpPath(), contants.DefaultInitKubeadmFileName)
 	outConfigPath := path.Join(k.getContentData().EtcPath(), contants.DefaultInitKubeadmFileName)
diff --git a/pkg/runtime/kubeadm.go b/pkg/runtime/kubeadm.go
index 91a06cd774b..588ff392ffb 100644
--- a/pkg/runtime/kubeadm.go
+++ b/pkg/runtime/kubeadm.go
@@ -115,11 +115,11 @@ func (k *KubeadmRuntime) getCGroupDriver(node string) (string, error) {
 func (k *KubeadmRuntime) MergeKubeadmConfig() error {
 	if k.Config.ClusterFileKubeConfig != nil {
 		if err := k.LoadFromClusterfile(k.Config.ClusterFileKubeConfig); err != nil {
-			return fmt.Errorf("failed to load kubeadm Config from clusterfile: %v", err)
+			return fmt.Errorf("failed to load kubeadm config from clusterfile: %v", err)
 		}
 	}
 	if err := k.Merge(k.getDefaultKubeadmConfig()); err != nil {
-		return fmt.Errorf("failed to merge kubeadm Config: %v", err)
+		return fmt.Errorf("failed to merge kubeadm config: %v", err)
 	}
 	k.setKubeadmAPIVersion()
 	return nil
diff --git a/pkg/runtime/kubeadm_config.go b/pkg/runtime/kubeadm_config.go
index 0f4e0462f8d..fa9bb5cd851 100644
--- a/pkg/runtime/kubeadm_config.go
+++ b/pkg/runtime/kubeadm_config.go
@@ -88,12 +88,12 @@ func (k *KubeadmConfig) Merge(kubeadmYamlPath string) error {
 	}
 	defaultKubeadmConfig, err = LoadKubeadmConfigs(kubeadmYamlPath, DecodeCRDFromFile)
 	if err != nil {
-		return fmt.Errorf("failed to found kubeadm Config from %s: %v", kubeadmYamlPath, err)
+		return fmt.Errorf("failed to found kubeadm config from %s: %v", kubeadmYamlPath, err)
 	}
 	k.APIServer.CertSANs = append(k.APIServer.CertSANs, defaultKubeadmConfig.APIServer.CertSANs...)
 	err = mergo.Merge(k, defaultKubeadmConfig)
 	if err != nil {
-		return fmt.Errorf("failed to merge kubeadm Config: %v", err)
+		return fmt.Errorf("failed to merge kubeadm config: %v", err)
 	}
 	//using the DefaultKubeadmConfig configuration merge
 	return k.Merge("")
diff --git a/pkg/runtime/master.go b/pkg/runtime/master.go
index 3c5dfea695d..6412f2648ba 100644
--- a/pkg/runtime/master.go
+++ b/pkg/runtime/master.go
@@ -85,7 +85,7 @@ func (k *KubeadmRuntime) ConfigJoinMasterKubeadmToMaster(master string) error {
 	}
 	err = k.sshCopy(master, joinConfigPath, outConfigPath)
 	if err != nil {
-		return fmt.Errorf("copy Config join master kubeadm Config error: %s", err.Error())
+		return fmt.Errorf("copy config join master kubeadm config error: %s", err.Error())
 	}
 	return nil
 }