commit bb543b3964d1d8c0adf88f8873d78987b9b7a5d2
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

Enable ContainerD for k8s-ha-calico-flannel-virtlet

Related issue: PROD-23654

Change-Id: I612fda3b4aea720a729270ad9d37adfb063ea2e1

classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml

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: