Merge pull request #8354 from vishh/kube2sky_2

Revert kube2sky to use kubernetes-ro service

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

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
 		}
 	}

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'] }}