Merge pull request #3071 from weaveworks/remove-kube-fallback

Remove localhost:8080 fallback for Kubernetes api-server
This commit is contained in:
Martynas Pumputis authored and GitHub committed 2017-07-24 07:37:02 +02:00
commit 08bca70192
1 file changed
-11
-11
View File
@@ -20,17 +20,6 @@ func getKubePeers() ([]string, error) {
return nil, err
}
nodeList, err := c.Nodes().List(api.ListOptions{})
if err != nil {
// Fallback for cases (e.g. from kube-up.sh) where kube-proxy is not running on master
config.Host = "http://localhost:8080"
log.Print("error contacting APIServer: ", err, "; trying with fallback: ", config.Host)
c, err = kubernetes.NewForConfig(config)
if err != nil {
return nil, err
}
nodeList, err = c.Nodes().List(api.ListOptions{})
}
if err != nil {
return nil, err
}