From 50522a207b69bf10e2738969dbd1c732618212ec Mon Sep 17 00:00:00 2001 From: Vishnu Kannan Date: Fri, 15 May 2015 16:09:24 -0700 Subject: [PATCH] Revert kube2sky to use kubernetes-ro service until the dns-token is updated to not use dns names. --- cluster/addons/dns/kube2sky/Makefile | 2 +- cluster/addons/dns/kube2sky/kube2sky.go | 2 +- cluster/addons/dns/skydns-rc.yaml.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cluster/addons/dns/kube2sky/Makefile b/cluster/addons/dns/kube2sky/Makefile index a80c17b252d..3943920487f 100644 --- a/cluster/addons/dns/kube2sky/Makefile +++ b/cluster/addons/dns/kube2sky/Makefile @@ -4,7 +4,7 @@ .PHONY: all kube2sky container push clean -TAG = 1.4 +TAG = 1.5 PREFIX = gcr.io/google_containers all: container diff --git a/cluster/addons/dns/kube2sky/kube2sky.go b/cluster/addons/dns/kube2sky/kube2sky.go index 709e84e1f66..531055c9e8e 100644 --- a/cluster/addons/dns/kube2sky/kube2sky.go +++ b/cluster/addons/dns/kube2sky/kube2sky.go @@ -195,7 +195,7 @@ func newKubeClient() (*kclient.Client, error) { var err error if config, err = kclientcmd.NewNonInteractiveDeferredLoadingClientConfig( &kclientcmd.ClientConfigLoadingRules{ExplicitPath: *argKubecfgFile}, - &kclientcmd.ConfigOverrides{ClusterInfo: kclientcmdapi.Cluster{Server: masterUrl}}).ClientConfig(); err != nil { + &kclientcmd.ConfigOverrides{ClusterInfo: kclientcmdapi.Cluster{Server: masterUrl, InsecureSkipTLSVerify: true}}).ClientConfig(); err != nil { return nil, err } } diff --git a/cluster/addons/dns/skydns-rc.yaml.in b/cluster/addons/dns/skydns-rc.yaml.in index ad810f78e7b..459ef47f767 100644 --- a/cluster/addons/dns/skydns-rc.yaml.in +++ b/cluster/addons/dns/skydns-rc.yaml.in @@ -28,7 +28,7 @@ spec: - -initial-cluster-token - skydns-etcd - name: kube2sky - image: gcr.io/google_containers/kube2sky:1.4 + image: gcr.io/google_containers/kube2sky:1.5 args: # command = "/kube2sky" - -domain={{ pillar['dns_domain'] }}