Adjust k8s network definition related to Calico refactoring.
Change-Id: I51c456ae4070931ccb3f58539ef24f482000b39a
diff --git a/classes/cluster/k8s-compact/kubernetes/compute.yml b/classes/cluster/k8s-compact/kubernetes/compute.yml
index 198c172..876a87f 100644
--- a/classes/cluster/k8s-compact/kubernetes/compute.yml
+++ b/classes/cluster/k8s-compact/kubernetes/compute.yml
@@ -13,14 +13,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-compact/kubernetes/control.yml b/classes/cluster/k8s-compact/kubernetes/control.yml
index d64e5c3..5b7cf53 100644
--- a/classes/cluster/k8s-compact/kubernetes/control.yml
+++ b/classes/cluster/k8s-compact/kubernetes/control.yml
@@ -55,9 +55,10 @@
ssl:
enabled: true
network:
- etcd:
- ssl:
- enabled: true
+ calico:
+ etcd:
+ ssl:
+ enabled: true
namespace:
netchecker:
enabled: true
diff --git a/classes/cluster/k8s-compact/kubernetes/init.yml b/classes/cluster/k8s-compact/kubernetes/init.yml
index d0c3740..5c62919 100644
--- a/classes/cluster/k8s-compact/kubernetes/init.yml
+++ b/classes/cluster/k8s-compact/kubernetes/init.yml
@@ -27,7 +27,7 @@
kubernetes_controller-manager_token: uXrdZ1YKF6qlYm3sHje2iEXMGAGDWOIU
kubernetes_dns_token: 0S1I4iJeFjq5fopPwwCwTp3xFpEZfeUl
kubernetes_docker_package: docker-engine=1.12.6-0~ubuntu-xenial
- 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