提交 05814cce 编写于 作者: S Sharif Elgamal

only apply kic networking overlay to control plane

上级 a09aa625
...@@ -42,7 +42,6 @@ type Bootstrapper interface { ...@@ -42,7 +42,6 @@ type Bootstrapper interface {
WaitForNode(config.ClusterConfig, config.Node, time.Duration) error WaitForNode(config.ClusterConfig, config.Node, time.Duration) error
JoinCluster(config.ClusterConfig, config.Node, string) error JoinCluster(config.ClusterConfig, config.Node, string) error
UpdateNode(config.ClusterConfig, config.Node, cruntime.Manager) error UpdateNode(config.ClusterConfig, config.Node, cruntime.Manager) error
SetupNode(config.ClusterConfig) error
GenerateToken(config.ClusterConfig) (string, error) GenerateToken(config.ClusterConfig) (string, error)
// LogCommands returns a map of log type to a command which will display that log. // LogCommands returns a map of log type to a command which will display that log.
LogCommands(LogOptions) map[string]string LogCommands(LogOptions) map[string]string
......
...@@ -215,8 +215,10 @@ func (k *Bootstrapper) StartCluster(cfg config.ClusterConfig) error { ...@@ -215,8 +215,10 @@ func (k *Bootstrapper) StartCluster(cfg config.ClusterConfig) error {
return errors.Wrapf(err, "init failed. output: %q", rr.Output()) return errors.Wrapf(err, "init failed. output: %q", rr.Output())
} }
if err = k.SetupNode(cfg); err != nil { if cfg.Driver == driver.Docker {
return errors.Wrap(err, "setting up node") if err := k.applyKicOverlay(cfg); err != nil {
return errors.Wrap(err, "apply kic overlay")
}
} }
if err := k.applyNodeLabels(cfg); err != nil { if err := k.applyNodeLabels(cfg); err != nil {
...@@ -234,17 +236,6 @@ func (k *Bootstrapper) StartCluster(cfg config.ClusterConfig) error { ...@@ -234,17 +236,6 @@ func (k *Bootstrapper) StartCluster(cfg config.ClusterConfig) error {
return nil return nil
} }
// SetupNode runs commands that need to be on all nodes
func (k *Bootstrapper) SetupNode(cfg config.ClusterConfig) error {
if cfg.Driver == driver.Docker {
if err := k.applyKicOverlay(cfg); err != nil {
return errors.Wrap(err, "apply kic overlay")
}
}
return nil
}
// client sets and returns a Kubernetes client to use to speak to a kubeadm launched apiserver // client sets and returns a Kubernetes client to use to speak to a kubeadm launched apiserver
func (k *Bootstrapper) client(ip string, port int) (*kubernetes.Clientset, error) { func (k *Bootstrapper) client(ip string, port int) (*kubernetes.Clientset, error) {
if k.k8sClient != nil { if k.k8sClient != nil {
......
...@@ -124,9 +124,6 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo ...@@ -124,9 +124,6 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo
exit.WithError("setting up certs", err) exit.WithError("setting up certs", err)
} }
if err = bs.SetupNode(cc); err != nil {
exit.WithError("Failed to setup node", err)
}
} }
configureMounts() configureMounts()
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册