Refactor k8s network section definitions. Calico part
In this patch all calico related parameters are moved to
'network.calico' subsection.
Also added small fixes for deployment.
Change-Id: I32882487455f47c84a87511e384be32e9ed42622
diff --git a/metadata/service/common.yml b/metadata/service/common.yml
index bedb3b3..8e51e56 100644
--- a/metadata/service/common.yml
+++ b/metadata/service/common.yml
@@ -71,4 +71,3 @@
cluster_name: ${_param:cluster_name}
network:
engine: none
- mtu: 1500
diff --git a/metadata/service/master/cluster.yml b/metadata/service/master/cluster.yml
index 8088d33..dd70c05 100644
--- a/metadata/service/master/cluster.yml
+++ b/metadata/service/master/cluster.yml
@@ -53,14 +53,15 @@
kube-system:
enabled: True
network:
- etcd:
- members:
- - host: ${_param:cluster_node01_address}
- port: 4001
- - host: ${_param:cluster_node02_address}
- port: 4001
- - host: ${_param:cluster_node03_address}
- port: 4001
+ calico:
+ etcd:
+ members:
+ - host: ${_param:cluster_node01_address}
+ port: 4001
+ - host: ${_param:cluster_node02_address}
+ port: 4001
+ - host: ${_param:cluster_node03_address}
+ port: 4001
federation:
enabled: False
name: federation
diff --git a/metadata/service/master/single.yml b/metadata/service/master/single.yml
index 80ad876..89668c6 100644
--- a/metadata/service/master/single.yml
+++ b/metadata/service/master/single.yml
@@ -19,6 +19,7 @@
kubelet:
address: ${_param:cluster_local_address}
allow_privileged: True
+ fail_on_swap: True
apiserver:
address: ${_param:single_address}
bind_address: 0.0.0.0
@@ -78,10 +79,11 @@
kube-system:
enabled: True
network:
- etcd:
- members:
- - host: ${_param:single_address}
- port: 4001
+ calico:
+ etcd:
+ members:
+ - host: ${_param:single_address}
+ port: 4001
federation:
enabled: False
name: federation
diff --git a/metadata/service/pool/cluster.yml b/metadata/service/pool/cluster.yml
index 173690c..cc5bec7 100644
--- a/metadata/service/pool/cluster.yml
+++ b/metadata/service/pool/cluster.yml
@@ -37,12 +37,12 @@
kube_proxy: ${_param:kubernetes_kube-proxy_token}
ca: kubernetes
network:
- hash: 77169cdadb80a5e33e9d9fe093ed0d99
- etcd:
- members:
- - host: ${_param:cluster_node01_address}
- port: 4001
- - host: ${_param:cluster_node02_address}
- port: 4001
- - host: ${_param:cluster_node03_address}
- port: 4001
+ calico:
+ etcd:
+ members:
+ - host: ${_param:cluster_node01_address}
+ port: 4001
+ - host: ${_param:cluster_node02_address}
+ port: 4001
+ - host: ${_param:cluster_node03_address}
+ port: 4001
diff --git a/metadata/service/pool/single.yml b/metadata/service/pool/single.yml
index eefb9ce..28c61fb 100644
--- a/metadata/service/pool/single.yml
+++ b/metadata/service/pool/single.yml
@@ -28,13 +28,14 @@
config: /etc/kubernetes/manifests
allow_privileged: True
frequency: 5s
+ fail_on_swap: True
token:
kubelet: ${_param:kubernetes_kubelet_token}
kube_proxy: ${_param:kubernetes_kube-proxy_token}
ca: kubernetes
network:
- hash: 77169cdadb80a5e33e9d9fe093ed0d99
- etcd:
- members:
- - host: ${_param:master_address}
- port: 4001
+ calico:
+ etcd:
+ members:
+ - host: ${_param:master_address}
+ port: 4001