| commit | 11a0cd2ff3d14d900060c8d22a1bd88cbe76b24b | [log] [tgz] |
|---|---|---|
| author | Andrey Shestakov <ashestakov@mirantis.com> | Mon Mar 19 17:24:41 2018 +0200 |
| committer | Andrey Shestakov <ashestakov@mirantis.com> | Mon Mar 19 17:24:41 2018 +0200 |
| tree | e265f661f4e7405af0c8059f2e4b10248a9d04f0 | |
| parent | 4cf6dfc9492151b58996757348b8157b8ee9855a [diff] |
Change k8s network definitions structure. Change-Id: Ibb460339e4f059efc1da7df587cad5f79a206068
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml index 2b91e0d..476f176 100644 --- a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml +++ b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
@@ -20,9 +20,8 @@ address: ${_param:single_address} fail_on_swap: ${_param:kubelet_fail_on_swap} network: - cnis: - - calico calico: + enabled: true image: ${_param:kubernetes_calico_image} calicoctl_image: ${_param:kubernetes_calico_calicoctl_image} cni_image: ${_param:kubernetes_calico_cni_image}
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/control.yml b/classes/cluster/k8s-ha-calico/kubernetes/control.yml index 6629e13..26a8608 100644 --- a/classes/cluster/k8s-ha-calico/kubernetes/control.yml +++ b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
@@ -59,9 +59,8 @@ ssl: enabled: true network: - cnis: - - calico calico: + enabled: true etcd: ssl: enabled: true