| commit | 23477cb93e18397226a14d4f53fbe3adb9a28514 | [log] [tgz] |
|---|---|---|
| author | Pavel Cizinsky <pcizinsky@mirantis.com> | Wed Oct 17 13:52:01 2018 +0000 |
| committer | Gerrit Code Review <mail@domain.com> | Wed Oct 17 13:52:01 2018 +0000 |
| tree | d0c0fc231b7a46bdf31ab61f0a394281b8b56bec | |
| parent | bb543b3964d1d8c0adf88f8873d78987b9b7a5d2 [diff] | |
| parent | a2dc4c980dce6d7266c055a0aef43b14c2507160 [diff] |
Merge "fix interface name eth -> ens"
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