| commit | bb543b3964d1d8c0adf88f8873d78987b9b7a5d2 | [log] [tgz] |
|---|---|---|
| author | Andrey Shestakov <ashestakov@mirantis.com> | Mon Oct 08 18:28:45 2018 +0300 |
| committer | Andrey Shestakov <ashestakov@mirantis.com> | Tue Oct 16 14:13:27 2018 +0300 |
| tree | f2eb4c95d9258b7e35edb2d0ab0ccaf588b7ada9 | |
| parent | aad22d6e0f1fb2a14401e21b4a16c1fae8e0d962 [diff] |
Enable ContainerD for k8s-ha-calico-flannel-virtlet Related issue: PROD-23654 Change-Id: I612fda3b4aea720a729270ad9d37adfb063ea2e1
diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml index fa9a04d..cb40b30 100644 --- a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml +++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml
@@ -1,5 +1,6 @@ classes: -- system.linux.system.repo.docker_legacy +- system.linux.system.repo.mcp.apt_mirantis.docker_legacy +- system.linux.system.repo.mcp.apt_mirantis.docker - system.kubernetes.pool.cluster - system.linux.network.hosts - system.salt.minion.cert.k8s_client
diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml index ca83d95..6e95a6e 100644 --- a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml +++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml
@@ -26,7 +26,7 @@ enabled: true setup: calico: - key: /calico/v1/ipam/v4/pool/${_param:calico_private_network}-${_param:calico_private_netmask} + key: /calico/ipam/v2/assignment/ipv4/block/${_param:calico_private_network}-${_param:calico_private_netmask} value: '{"masquerade":true,"cidr":"${_param:calico_private_network}/${_param:calico_private_netmask}"}' kubernetes: common:
diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml index c994041..42f5e32 100644 --- a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml +++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml
@@ -39,6 +39,7 @@ kubernetes_netchecker_enabled: true kubernetes_calico_policy_enabled: false kubernetes_virtlet_enabled: true + kubernetes_containerd_enabled: true # addresses and hostnames kubernetes_internal_api_address: 10.254.0.1