Revert "Update sl_k8s_calico models"
This reverts commit e048a839e5d62dab349a5cf20fc9c2886add175f.
Change-Id: Ic03d0e11deabca745a2601ef191acb56e77841b7
diff --git a/classes/cluster/sl_k8s_calico/kubernetes/compute.yml b/classes/cluster/sl_k8s_calico/kubernetes/compute.yml
index 1ef30a2..81cb2d7 100644
--- a/classes/cluster/sl_k8s_calico/kubernetes/compute.yml
+++ b/classes/cluster/sl_k8s_calico/kubernetes/compute.yml
@@ -3,13 +3,17 @@
- system.kubernetes.pool.cluster
- system.salt.minion.cert.k8s_client
- system.salt.minion.cert.etcd_client
-- cluster.sl_k8s_calico.infra
-- cluster.overrides
+- cluster.sl_k8s_calico
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:
- - ${_param:kubernetes_docker_package}
+ - docker-engine=1.12.6-0~ubuntu-xenial
- python-docker
kubernetes:
pool:
@@ -22,7 +26,6 @@
image: ${_param:kubernetes_calicoctl_image}
cni:
image: ${_param:kubernetes_calico_cni_image}
- mtu: ${_param:kubernetes_mtu}
common:
hyperkube:
image: ${_param:kubernetes_hyperkube_image}
@@ -31,15 +34,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:
- ens4:
- route:
- kubernetes_services:
- address: 10.254.0.0
- netmask: 255.255.0.0
- gateway: ${_param:single_address}
- interface:
- ens4:
+ primary_interface:
route:
kubernetes_services:
address: 10.254.0.0