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
update manifests to use hyperkube from common
Change-Id: I6e5e84cf252399120141ad941ac7aa6dae7c16ac
diff --git a/metadata/service/common.yml b/metadata/service/common.yml
index f1f8197..b02880d 100644
--- a/metadata/service/common.yml
+++ b/metadata/service/common.yml
@@ -2,4 +2,4 @@
kubernetes:
common:
network:
- engine: none
\ No newline at end of file
+ engine: none
diff --git a/metadata/service/master/cluster.yml b/metadata/service/master/cluster.yml
index 4076dd8..46d391f 100644
--- a/metadata/service/master/cluster.yml
+++ b/metadata/service/master/cluster.yml
@@ -7,7 +7,6 @@
kubernetes:
master:
enabled: true
- version: ${_param:kubernetes_version}
registry:
host: tcpcloud
service_addresses: 10.254.0.0/16
@@ -33,6 +32,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}
@@ -54,4 +57,4 @@
- host: ${_param:cluster_node02_address}
port: 4001
- host: ${_param:cluster_node03_address}
- port: 4001
\ No newline at end of file
+ port: 4001
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
diff --git a/metadata/service/pool/cluster.yml b/metadata/service/pool/cluster.yml
index ea0bc8a..7c42e12 100644
--- a/metadata/service/pool/cluster.yml
+++ b/metadata/service/pool/cluster.yml
@@ -7,7 +7,6 @@
kubernetes:
pool:
enabled: true
- version: ${_param:kubernetes_version}
registry:
host: tcpcloud
host:
@@ -42,6 +41,3 @@
port: 4001
- host: ${_param:cluster_node03_address}
port: 4001
- cni:
- version: v0.3.0
- hash: 58237532e1b2b1be1fb3d12457da85f5
\ No newline at end of file
diff --git a/metadata/service/pool/single.yml b/metadata/service/pool/single.yml
index f3cb7c0..b01a719 100644
--- a/metadata/service/pool/single.yml
+++ b/metadata/service/pool/single.yml
@@ -7,7 +7,6 @@
kubernetes:
pool:
enabled: true
- version: ${_param:kubernetes_version}
registry:
host: tcpcloud
host:
@@ -35,6 +34,3 @@
members:
- host: ${_param:master_address}
port: 4001
- cni:
- version: v0.3.0
- hash: 58237532e1b2b1be1fb3d12457da85f5
\ No newline at end of file