Adjust k8s network definition related to Calico refactoring.
Change-Id: I51c456ae4070931ccb3f58539ef24f482000b39a
diff --git a/classes/cluster/k8s-aio-calico/kubernetes/compute.yml b/classes/cluster/k8s-aio-calico/kubernetes/compute.yml
index 9da4945..338f0e1 100644
--- a/classes/cluster/k8s-aio-calico/kubernetes/compute.yml
+++ b/classes/cluster/k8s-aio-calico/kubernetes/compute.yml
@@ -19,14 +19,13 @@
kubelet:
address: ${_param:single_address}
network:
- etcd:
- ssl:
- enabled: true
- image: ${_param:kubernetes_calico_image}
- calicoctl:
- image: ${_param:kubernetes_calicoctl_image}
- cni:
- image: ${_param:kubernetes_calico_cni_image}
+ calico:
+ image: ${_param:kubernetes_calico_image}
+ calicoctl_image: ${_param:kubernetes_calico_calicoctl_image}
+ cni_image: ${_param:kubernetes_calico_cni_image}
+ etcd:
+ ssl:
+ enabled: true
common:
addons:
virtlet:
diff --git a/classes/cluster/k8s-aio-calico/kubernetes/control.yml b/classes/cluster/k8s-aio-calico/kubernetes/control.yml
index a26ab0a..b14ecf9 100644
--- a/classes/cluster/k8s-aio-calico/kubernetes/control.yml
+++ b/classes/cluster/k8s-aio-calico/kubernetes/control.yml
@@ -51,9 +51,10 @@
kubelet:
address: ${_param:single_address}
network:
- etcd:
- ssl:
- enabled: true
+ calico:
+ etcd:
+ ssl:
+ enabled: true
namespace:
netchecker:
enabled: true
diff --git a/classes/cluster/k8s-aio-calico/kubernetes/init.yml b/classes/cluster/k8s-aio-calico/kubernetes/init.yml
index 42fc07e..38acf28 100644
--- a/classes/cluster/k8s-aio-calico/kubernetes/init.yml
+++ b/classes/cluster/k8s-aio-calico/kubernetes/init.yml
@@ -18,7 +18,7 @@
kubernetes_docker_package: docker-engine=1.12.6-0~ubuntu-xenial
# component docker images
- kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
+ kubernetes_calico_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4