| commit | e9ec619cfdfe1468cd7eb90488b690ba244888dc | [log] [tgz] |
|---|---|---|
| author | mcp-jenkins <mcp-jenkins@mirantis.com> | Fri Oct 05 15:51:53 2018 +0000 |
| committer | Gerrit Code Review <mail@domain.com> | Fri Oct 05 15:51:53 2018 +0000 |
| tree | 962806d5f6ffebee1c08bcb49cca9b23761f8670 | |
| parent | 271117f79220634c52e179d0e0edb258f5bbce74 [diff] | |
| parent | 7edd30c36eb90715bcea62e84706c514a1c06032 [diff] |
Merge "Configure kube-proxy cluster-cidr for calico."
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 676a1f8..e9cd961 100644 --- a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml +++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml
@@ -16,6 +16,9 @@ storage-driver: overlay2 kubernetes: pool: + proxy: + daemon_opts: + cluster-cidr: ${_param:calico_private_network}/${_param:calico_private_netmask} kubelet: address: ${_param:single_address} fail_on_swap: ${_param:kubelet_fail_on_swap}
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml index 2f5afd9..92e7a25 100644 --- a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml +++ b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
@@ -16,6 +16,9 @@ storage-driver: overlay2 kubernetes: pool: + proxy: + daemon_opts: + cluster-cidr: ${_param:calico_private_network}/${_param:calico_private_netmask} kubelet: address: ${_param:single_address} fail_on_swap: ${_param:kubelet_fail_on_swap}
diff --git a/classes/cluster/sl-k8s-calico/kubernetes/compute.yml b/classes/cluster/sl-k8s-calico/kubernetes/compute.yml index 1545532..bdb4290 100644 --- a/classes/cluster/sl-k8s-calico/kubernetes/compute.yml +++ b/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
@@ -18,6 +18,9 @@ storage-driver: overlay2 kubernetes: pool: + proxy: + daemon_opts: + cluster-cidr: ${_param:calico_private_network}/${_param:calico_private_netmask} kubelet: address: ${_param:single_address} fail_on_swap: ${_param:kubelet_fail_on_swap}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml index 5ac9e18..0c78e8d 100644 --- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml +++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
@@ -18,6 +18,9 @@ storage-driver: overlay2 kubernetes: pool: + proxy: + daemon_opts: + cluster-cidr: ${_param:calico_private_network}/${_param:calico_private_netmask} kubelet: address: ${_param:single_address} fail_on_swap: ${_param:kubelet_fail_on_swap}