Refactor parameters for k8s-aio-calico model.
* Moved k8s parameters to init file.
* Moved virtlet addon to compute k8s nodes.
Change-Id: Id6b1d65529b62dbecc8c3f15c7fecaa2beabb75c
diff --git a/classes/cluster/k8s-aio-calico/kubernetes/compute.yml b/classes/cluster/k8s-aio-calico/kubernetes/compute.yml
index b7be97b..7f9da05 100644
--- a/classes/cluster/k8s-aio-calico/kubernetes/compute.yml
+++ b/classes/cluster/k8s-aio-calico/kubernetes/compute.yml
@@ -1,25 +1,23 @@
classes:
- system.linux.system.repo.docker_legacy
-- system.kubernetes.pool.cluster
+- system.kubernetes.pool.single
- system.linux.network.hosts
-- system.salt.minion.cert.k8s_client
+- system.salt.minion.cert.k8s_client_single
- system.salt.minion.cert.etcd_client
- cluster.k8s-aio-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.7.8-3
docker:
host:
pkgs:
- - docker-engine=1.12.6-0~ubuntu-xenial
+ - - ${_param:kubernetes_docker_package}
- python-docker
options:
bip: 172.31.255.1/24
+ storage-driver: overlay2
kubernetes:
pool:
+ kubelet:
+ address: ${_param:single_address}
network:
etcd:
ssl:
@@ -30,6 +28,13 @@
cni:
image: ${_param:kubernetes_calico_cni_image}
common:
+ addons:
+ virtlet:
+ enabled: ${_param:kubernetes_virtlet_enabled}
+ namespace: ${_param:kubernetes_addon_namespace}
+ image: ${_param:kubernetes_virtlet_image}
+ hosts:
+ - ${linux:system:name}
hyperkube:
image: ${_param:kubernetes_hyperkube_image}
linux:
@@ -40,9 +45,16 @@
- 172.18.176.4
- 172.18.176.7
interface:
- primary_interface:
+ ens3:
+ enabled: true
+ type: eth
+ proto: static
+ name: ${_param:primary_interface}
+ address: ${_param:deploy_address}
+ netmask: 255.255.255.0
+ gateway: 192.168.10.1
route:
kubernetes_services:
address: 10.254.0.0
netmask: 255.255.0.0
- gateway: ${_param:single_address}
+ gateway: ${_param:deploy_address}