Skip to content

Commit

Permalink
feature(main): fix labring#960 for controller and schedule bind 0.0.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
cuisongliu committed Apr 28, 2022
1 parent 8f696e5 commit 667e54c
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
5 changes: 3 additions & 2 deletions pkg/runtime/default_kubeadm_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/runtime/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions pkg/runtime/kubeadm.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkg/runtime/kubeadm_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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("")
Expand Down
2 changes: 1 addition & 1 deletion pkg/runtime/master.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down

0 comments on commit 667e54c

Please sign in to comment.