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
diff --git a/classes/cluster/sl_k8s_calico/kubernetes/control.yml b/classes/cluster/sl_k8s_calico/kubernetes/control.yml
index a0c051a..d743dea 100644
--- a/classes/cluster/sl_k8s_calico/kubernetes/control.yml
+++ b/classes/cluster/sl_k8s_calico/kubernetes/control.yml
@@ -5,11 +5,10 @@
- system.salt.minion.cert.etcd_server
- system.kubernetes.master.cluster
- cluster.sl_k8s_calico.kubernetes.compute
-- cluster.sl_k8s_calico.infra
-- cluster.overrides
+- cluster.sl_k8s_calico
parameters:
_param:
- keepalived_vip_interface: ens3
+ keepalived_vip_interface: ${_param:primary_interface}
keepalived_vip_virtual_router_id: 60
etcd:
server:
@@ -24,15 +23,10 @@
kubernetes:
common:
addons:
- helm:
- enabled: ${_param:kubernetes_helm_enabled}
- calico_policy:
- enabled: ${_param:kubernetes_calico_policy_enabled}
- image: ${_param:kubernetes_calico_policy_image}
netchecker:
- enabled: ${_param:kubernetes_netchecker_enabled}
- agent_image: ${_param:kubernetes_netchecker_agent_image}
- server_image: ${_param:kubernetes_netchecker_server_image}
+ enabled: true
+ helm:
+ enabled: true
master:
etcd:
ssl:
@@ -43,5 +37,4 @@
enabled: true
namespace:
netchecker:
- enabled: ${_param:kubernetes_netchecker_enabled}
-
+ enabled: true
diff --git a/classes/cluster/sl_k8s_calico/kubernetes/init.yml b/classes/cluster/sl_k8s_calico/kubernetes/init.yml
index 7b7f819..307ebd0 100644
--- a/classes/cluster/sl_k8s_calico/kubernetes/init.yml
+++ b/classes/cluster/sl_k8s_calico/kubernetes/init.yml
@@ -12,27 +12,8 @@
kubernetes_scheduler_token: VgkUHfrW07zNxrb0ucFyX7NBnSJN9Xp6
kubernetes_controller-manager_token: uXrdZ1YKF6qlYm3sHje2iEXMGAGDWOIU
kubernetes_dns_token: 0S1I4iJeFjq5fopPwwCwTp3xFpEZfeUl
- kubernetes_mtu: 1500
etcd_initial_token: IN7KaRMSo3xkGxkjAAPtkRkAgqN4ZNRq
- # docker package version
- 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_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
- kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.6.2-2
- kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:v1.1.0
- kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:v1.1.0
- kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
-
- # switches of addons
- kubernetes_helm_enabled: true
- kubernetes_netchecker_enabled: true
- kubernetes_calico_policy_enabled: false
-
# addresses and hostnames
kubernetes_internal_api_address: 10.254.0.1
kubernetes_control_hostname: ctl
@@ -70,12 +51,6 @@
linux:
network:
- resolv:
- domain: sl_k8s_calico.local
- options:
- - ndots:5
- - timeout:2
- - attempts:2
host:
ctl:
address: ${_param:kubernetes_control_address}
@@ -113,10 +88,6 @@
- ${_param:kubernetes_proxy_node01_hostname}
- ${_param:kubernetes_proxy_node01_hostname}.${_param:cluster_domain}
system:
- user:
- root:
- name: root
- password: false
rc:
local: |
#!/bin/sh -e
@@ -128,5 +99,5 @@
# Make sure that the script will "exit 0" on success or any other
# value on error.
#
- ip r a 10.254.0.0/16 dev ens4
+ ip r a 10.254.0.0/16 dev ens3
exit 0