github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8354 from vishh/kube2sky_2 

Revert kube2sky to use kubernetes-ro service
pull/6/head
Vish Kannan 2015-05-15 21:23:15 -07:00
parent fce749b048 50522a207b
commit d51e131726
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/addons/dns/kube2sky/Makefile
View File

@ -4,7 +4,7 @@
.PHONY: all kube2sky container push clean
TAG = 1.4
TAG = 1.5
PREFIX = gcr.io/google_containers
all: container

2
cluster/addons/dns/kube2sky/kube2sky.go
View File

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

2
cluster/addons/dns/skydns-rc.yaml.in
View File

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