Revert "update sources of k8s and calico installation"
This reverts commit 76ecb2d41fc078054259ba68a7ba9720dbf02968.
Change-Id: Idffc40a6deae187c70671a968dd059463c72e3f0
diff --git a/metadata/service/common.yml b/metadata/service/common.yml
index b02880d..f1f8197 100644
--- a/metadata/service/common.yml
+++ b/metadata/service/common.yml
@@ -2,4 +2,4 @@
kubernetes:
common:
network:
- engine: none
+ engine: none
\ No newline at end of file
diff --git a/metadata/service/master/cluster.yml b/metadata/service/master/cluster.yml
index 46d391f..4076dd8 100644
--- a/metadata/service/master/cluster.yml
+++ b/metadata/service/master/cluster.yml
@@ -7,6 +7,7 @@
kubernetes:
master:
enabled: true
+ version: ${_param:kubernetes_version}
registry:
host: tcpcloud
service_addresses: 10.254.0.0/16
@@ -32,10 +33,6 @@
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}
@@ -57,4 +54,4 @@
- host: ${_param:cluster_node02_address}
port: 4001
- host: ${_param:cluster_node03_address}
- port: 4001
+ port: 4001
\ No newline at end of file
diff --git a/metadata/service/master/single.yml b/metadata/service/master/single.yml
index 4c4fcf2..21f2eb7 100644
--- a/metadata/service/master/single.yml
+++ b/metadata/service/master/single.yml
@@ -7,6 +7,7 @@
kubernetes:
master:
enabled: true
+ version: ${_param:kubernetes_version}
registry:
host: tcpcloud
service_addresses: 10.254.0.0/16
@@ -28,10 +29,6 @@
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}
@@ -49,4 +46,4 @@
etcd:
members:
- host: ${_param:single_address}
- port: 4001
+ port: 4001
\ No newline at end of file
diff --git a/metadata/service/pool/cluster.yml b/metadata/service/pool/cluster.yml
index 7c42e12..ea0bc8a 100644
--- a/metadata/service/pool/cluster.yml
+++ b/metadata/service/pool/cluster.yml
@@ -7,6 +7,7 @@
kubernetes:
pool:
enabled: true
+ version: ${_param:kubernetes_version}
registry:
host: tcpcloud
host:
@@ -41,3 +42,6 @@
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 b01a719..f3cb7c0 100644
--- a/metadata/service/pool/single.yml
+++ b/metadata/service/pool/single.yml
@@ -7,6 +7,7 @@
kubernetes:
pool:
enabled: true
+ version: ${_param:kubernetes_version}
registry:
host: tcpcloud
host:
@@ -34,3 +35,6 @@
members:
- host: ${_param:master_address}
port: 4001
+ cni:
+ version: v0.3.0
+ hash: 58237532e1b2b1be1fb3d12457da85f5
\ No newline at end of file