Browse Source

Merge pull request #111 from Smana/flannel_pods_subnet

use 'kube_pods_subnet' var for flannel conf
pull/109/head
Smaine Kahlouch 8 years ago
parent
commit
faf50ea698
2 changed files with 2 additions and 2 deletions
  1. 2
      roles/apps/k8s-postgres
  2. 2
      roles/network_plugin/templates/flannel/network.json

2
roles/apps/k8s-postgres

@ -1 +1 @@
Subproject commit 0f9cda318283ba67b73ba57e794347cbffb2a169
Subproject commit a03a14c46f19732fa7a3ee37a37d9f0375a6e2d2

2
roles/network_plugin/templates/flannel/network.json

@ -1 +1 @@
{ "Network": "{{ kube_service_addresses }}", "SubnetLen": {{ kube_network_node_prefix }}, "Backend": { "Type": "vxlan" } }
{ "Network": "{{ kube_pods_subnet }}", "SubnetLen": {{ kube_network_node_prefix }}, "Backend": { "Type": "vxlan" } }
Loading…
Cancel
Save