github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

New release of kube2sky v1.8

Browse Source
This commit is contained in:
Vishnu Kannan 2015-05-28 11:07:09 -07:00
parent 0ae4defc9d
commit 404558f29c
4 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cluster/addons/dns/kube2sky/Changelog
View File

@ -5,3 +5,8 @@
## Version 1.7 (May 25 2015 Vishnu Kannan <vishnuk@google.com>)
- Adding support for headless services. All pods backing a headless service is addressible via DNS RR.
## Version 1.8 (May 18 2015 Vishnu Kannan <vishnuk@google.com>)
- Avoid making connections to the master insecure by default
- Let users override the master URL in kubeconfig via a flag

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

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

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

@ -49,7 +49,7 @@ var (
argEtcdMutationTimeout = flag.Duration("etcd_mutation_timeout", 10*time.Second, "crash after retrying etcd mutation for a specified duration")
argEtcdServer = flag.String("etcd-server", "http://127.0.0.1:4001", "URL to etcd server")
argKubecfgFile = flag.String("kubecfg_file", "", "Location of kubecfg file for access to kubernetes service")
argKubeMasterUrl = flag.String("kube_master_url", "", "Url to reach kubernetes master. Env variables in this flag will be expanded.")
argKubeMasterURL = flag.String("kube_master_url", "", "URL to reach kubernetes master. Env variables in this flag will be expanded.")
)
const (
@ -334,15 +334,15 @@ func newEtcdClient(etcdServer string) (*etcd.Client, error) {
return client, nil
}
func getKubeMasterUrl() (string, error) {
parsedUrl, err := url.Parse(os.ExpandEnv(*argKubeMasterUrl))
func getKubeMasterURL() (string, error) {
parsedURL, err := url.Parse(os.ExpandEnv(*argKubeMasterURL))
if err != nil {
return "", fmt.Errorf("failed to parse --kube_master_url %s - %v", *argKubeMasterUrl, err)
return "", fmt.Errorf("failed to parse --kube_master_url %s - %v", *argKubeMasterURL, err)
}
if parsedUrl.Scheme == "" || parsedUrl.Host == "" || parsedUrl.Host == ":" {
return "", fmt.Errorf("invalid --kube_master_url specified %s", *argKubeMasterUrl)
if parsedURL.Scheme == "" || parsedURL.Host == "" || parsedURL.Host == ":" {
return "", fmt.Errorf("invalid --kube_master_url specified %s", *argKubeMasterURL)
}
return parsedUrl.String(), nil
return parsedURL.String(), nil
}
// TODO: evaluate using pkg/client/clientcmd
@ -352,8 +352,8 @@ func newKubeClient() (*kclient.Client, error) {
err error
masterURL string
)
if *argKubeMasterUrl != "" {
masterURL, err = getKubeMasterUrl()
if *argKubeMasterURL != "" {
masterURL, err = getKubeMasterURL()
if err != nil {
return nil, err
}

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

@ -1,21 +1,21 @@
apiVersion: v1beta3
kind: ReplicationController
metadata:
name: kube-dns-v1
name: kube-dns-v2
namespace: default
labels:
k8s-app: kube-dns-v1
k8s-app: kube-dns-v2
kubernetes.io/cluster-service: "true"
spec:
replicas: {{ pillar['dns_replicas'] }}
selector:
k8s-app: kube-dns
version: v1
version: v2
template:
metadata:
labels:
k8s-app: kube-dns
version: v1
version: v2
kubernetes.io/cluster-service: "true"
spec:
containers:
@ -30,11 +30,12 @@ spec:
- -initial-cluster-token
- skydns-etcd
- name: kube2sky
image: gcr.io/google_containers/kube2sky:1.7
image: gcr.io/google_containers/kube2sky:1.8
args:
# command = "/kube2sky"
- -domain={{ pillar['dns_domain'] }}
- -kubecfg_file=/etc/dns_token/kubeconfig
- -kube_master_url=https://${KUBERNETES_SERVICE_HOST}:${KUBERNETES_SERVICE_PORT}
volumeMounts:
- mountPath: /etc/dns_token
name: dns-token