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
diff --git a/classes/cluster/sl_k8s_calico/kubernetes/control.yml b/classes/cluster/sl_k8s_calico/kubernetes/control.yml
index d743dea..a0c051a 100644
--- a/classes/cluster/sl_k8s_calico/kubernetes/control.yml
+++ b/classes/cluster/sl_k8s_calico/kubernetes/control.yml
@@ -5,10 +5,11 @@
- system.salt.minion.cert.etcd_server
- system.kubernetes.master.cluster
- cluster.sl_k8s_calico.kubernetes.compute
-- cluster.sl_k8s_calico
+- cluster.sl_k8s_calico.infra
+- cluster.overrides
parameters:
_param:
- keepalived_vip_interface: ${_param:primary_interface}
+ keepalived_vip_interface: ens3
keepalived_vip_virtual_router_id: 60
etcd:
server:
@@ -23,10 +24,15 @@
kubernetes:
common:
addons:
- netchecker:
- enabled: true
helm:
- enabled: true
+ 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}
master:
etcd:
ssl:
@@ -37,4 +43,5 @@
enabled: true
namespace:
netchecker:
- enabled: true
+ enabled: ${_param:kubernetes_netchecker_enabled}
+
diff --git a/classes/cluster/sl_k8s_calico/kubernetes/init.yml b/classes/cluster/sl_k8s_calico/kubernetes/init.yml
index 307ebd0..7b7f819 100644
--- a/classes/cluster/sl_k8s_calico/kubernetes/init.yml
+++ b/classes/cluster/sl_k8s_calico/kubernetes/init.yml
@@ -12,8 +12,27 @@
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
@@ -51,6 +70,12 @@
linux:
network:
+ resolv:
+ domain: sl_k8s_calico.local
+ options:
+ - ndots:5
+ - timeout:2
+ - attempts:2
host:
ctl:
address: ${_param:kubernetes_control_address}
@@ -88,6 +113,10 @@
- ${_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
@@ -99,5 +128,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 ens3
+ ip r a 10.254.0.0/16 dev ens4
exit 0