github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 18:00:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8354 from vishh/kube2sky_2

Browse Source 
Revert kube2sky to use kubernetes-ro service
This commit is contained in:
Vish Kannan 2015-05-15 21:23:15 -07:00
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 .PHONY: all kube2sky container push clean
TAG = 1.4 TAG = 1.5
PREFIX = gcr.io/google_containers PREFIX = gcr.io/google_containers
all: container all: container

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

@ -195,7 +195,7 @@ func newKubeClient() (*kclient.Client, error) {
var err error var err error
if config, err = kclientcmd.NewNonInteractiveDeferredLoadingClientConfig( if config, err = kclientcmd.NewNonInteractiveDeferredLoadingClientConfig(
&kclientcmd.ClientConfigLoadingRules{ExplicitPath: *argKubecfgFile}, &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 return nil, err
} }
} }

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

@ -28,7 +28,7 @@ spec:
- -initial-cluster-token - -initial-cluster-token
- skydns-etcd - skydns-etcd
- name: kube2sky - name: kube2sky
image: gcr.io/google_containers/kube2sky:1.4 image: gcr.io/google_containers/kube2sky:1.5
args: args:
# command = "/kube2sky" # command = "/kube2sky"
- -domain={{ pillar['dns_domain'] }} - -domain={{ pillar['dns_domain'] }}