Merge pull request #55 from justinsb/upup_dont_hardcode_122

upup: don't hard-code v1.2.2 in image names
This commit is contained in:
Mike Danese 2016-06-06 14:26:41 -07:00
commit 00108bbdd2
4 changed files with 11 additions and 3 deletions

View File

@ -10,6 +10,17 @@ CACertificate: {{ Base64Encode (CA.Cert "ca").AsString }}
APIServer:
Certificate: {{ Base64Encode (CA.Cert "master").AsString }}
Key: {{ Base64Encode (CA.PrivateKey "master").AsString }}
Image: gcr.io/google_containers/kube-apiserver:v{{ .KubernetesVersion }}
KubeControllerManager:
ClusterName: {{ .ClusterName }}
Image: gcr.io/google_containers/kube-controller-manager:v{{ .KubernetesVersion }}
KubeScheduler:
Image: gcr.io/google_containers/kube-scheduler:v{{ .KubernetesVersion }}
KubeProxy:
Image: gcr.io/google_containers/kube-proxy:v{{ .KubernetesVersion }}
KubeUser: {{ .KubeUser }}
KubePassword: {{ GetOrCreateSecret "kube" }}

View File

@ -2,7 +2,6 @@ APIServer:
SecurePort: 443
PathSrvKubernetes: /srv/kubernetes
PathSrvSshproxy: /srv/sshproxy
Image: gcr.io/google_containers/kube-apiserver:v1.2.2
Address: 127.0.0.1
EtcdServers: http://127.0.0.1:4001
EtcdServersOverrides: /events#http://127.0.0.1:4002

View File

@ -1,6 +1,5 @@
KubeControllerManager:
PathSrvKubernetes: /srv/kubernetes
Image: gcr.io/google_containers/kube-controller-manager:v1.2.2
Master: 127.0.0.1:8080
ClusterName: kubernetes
ClusterCIDR: 10.244.0.0/16

View File

@ -1,4 +1,3 @@
KubeScheduler:
Image: gcr.io/google_containers/kube-scheduler:v1.2.2
Master: 127.0.0.1:8080
LogLevel: 2