From d0facbf2ee357d2f1e7be6e2a43bcf9212ac52ae Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Thu, 16 Apr 2020 00:55:02 -0700 Subject: [PATCH] revert addon change for another PR --- pkg/minikube/node/start.go | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go index b8e3c09c39..8949f3a602 100644 --- a/pkg/minikube/node/start.go +++ b/pkg/minikube/node/start.go @@ -133,6 +133,11 @@ func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) { wg.Done() }() + // enable addons, both old and new! + if starter.ExistingAddons != nil { + go addons.Start(&wg, starter.Cfg, starter.ExistingAddons, config.AddonList) + } + if apiServer { // special ops for none , like change minikube directory. // multinode super doesn't work on the none driver @@ -145,10 +150,6 @@ func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) { if err := bs.WaitForNode(*starter.Cfg, *starter.Node, viper.GetDuration(waitTimeout)); err != nil { return nil, errors.Wrap(err, "Wait failed") } - // enable addons, both old and new! - if starter.ExistingAddons != nil { - go addons.Start(&wg, starter.Cfg, starter.ExistingAddons, config.AddonList) - } } } else { if err := bs.UpdateNode(*starter.Cfg, *starter.Node, cr); err != nil { @@ -168,10 +169,6 @@ func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) { if err = bs.JoinCluster(*starter.Cfg, *starter.Node, joinCmd); err != nil { return nil, errors.Wrap(err, "joining cluster") } - // enable addons, both old and new! - if starter.ExistingAddons != nil { - go addons.Start(&wg, starter.Cfg, starter.ExistingAddons, config.AddonList) - } } wg.Wait() @@ -401,7 +398,7 @@ func validateNetwork(h *host.Host, r command.Runner, imageRepository string) (st ipExcluded := proxy.IsIPExcluded(ip) // Skip warning if minikube ip is already in NO_PROXY k = strings.ToUpper(k) // for http_proxy & https_proxy if (k == "HTTP_PROXY" || k == "HTTPS_PROXY") && !ipExcluded && !warnedOnce { - out.WarningT("You appear to be using a proxy, but your NO_PROXY environment does not include the minikube IP ({{.ip_address}}). Please see {{.documentation_url}} for more details", out.V{"ip_address": ip, "documentation_url": "https://minikube.sigs.k8s.io/docs/handbook/vpn_and_proxy/"}) + out.WarningT("You appear to be using a proxy, but your NO_PROXY environment does not include the minikube IP ({{.ip_address}}). Please see {{.documentation_url}} for more details", out.V{"ip_address": ip, "documentation_url": "https://minikube.sigs.k8s.io/docs/reference/networking/proxy/"}) warnedOnce = true } }