Update sl_k8s_calico models
Change-Id: I89bcf21ed3139110106d6bd3ffe8d30a61dbe553
diff --git a/classes/cluster/sl_k8s_calico/kubernetes/compute.yml b/classes/cluster/sl_k8s_calico/kubernetes/compute.yml
index 81cb2d7..1ef30a2 100644
--- a/classes/cluster/sl_k8s_calico/kubernetes/compute.yml
+++ b/classes/cluster/sl_k8s_calico/kubernetes/compute.yml
@@ -3,17 +3,13 @@
- system.kubernetes.pool.cluster
- system.salt.minion.cert.k8s_client
- system.salt.minion.cert.etcd_client
-- cluster.sl_k8s_calico
+- cluster.sl_k8s_calico.infra
+- cluster.overrides
parameters:
- _param:
- kubernetes_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_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.6.2-2
docker:
host:
pkgs:
- - docker-engine=1.12.6-0~ubuntu-xenial
+ - ${_param:kubernetes_docker_package}
- python-docker
kubernetes:
pool:
@@ -26,6 +22,7 @@
image: ${_param:kubernetes_calicoctl_image}
cni:
image: ${_param:kubernetes_calico_cni_image}
+ mtu: ${_param:kubernetes_mtu}
common:
hyperkube:
image: ${_param:kubernetes_hyperkube_image}
@@ -34,15 +31,15 @@
resolv:
dns:
- 10.254.0.10
- - 172.18.176.4
- - 172.18.176.7
- domain: virtual-mcp11-k8s-calico.local
- options:
- - ndots:5
- - timeout:2
- - attempts:2
interface:
- primary_interface:
+ ens4:
+ route:
+ kubernetes_services:
+ address: 10.254.0.0
+ netmask: 255.255.0.0
+ gateway: ${_param:single_address}
+ interface:
+ ens4:
route:
kubernetes_services:
address: 10.254.0.0