update sources of k8s and calico installation
move basic k8s setup to common
copy cni from hyperkube
configurable calico node image
use calico/cni image for obtaining cnis
use calico/ctl image for obtaining calicoctl binary
add cross requirement for k8s services and hyperkube
update metadata for new pillar model
Change-Id: Ie8d6a858a8898861aa8739b62130af971728f272
diff --git a/metadata/service/master/single.yml b/metadata/service/master/single.yml
index 21f2eb7..4c4fcf2 100644
--- a/metadata/service/master/single.yml
+++ b/metadata/service/master/single.yml
@@ -7,7 +7,6 @@
kubernetes:
master:
enabled: true
- version: ${_param:kubernetes_version}
registry:
host: tcpcloud
service_addresses: 10.254.0.0/16
@@ -29,6 +28,10 @@
replicas: 1
domain: cluster.local
server: 10.254.0.10
+ dashboard:
+ enabled: True
+ heapster_influxdb:
+ enabled: False
token:
admin: ${_param:kubernetes_admin_token}
kubelet: ${_param:kubernetes_kubelet_token}
@@ -46,4 +49,4 @@
etcd:
members:
- host: ${_param:single_address}
- port: 4001
\ No newline at end of file
+ port: 4001