Merge pull request #3236 from luisyonaldo/fix-configure-calico-network-pool

Fix configure calico network pool for ipipMode = CrossSubnet
pull/3241/merge
k8s-ci-robot 2018-09-04 23:22:33 -07:00 committed by GitHub
commit a512f68650
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions

View File

@ -97,7 +97,7 @@
},
"spec": {
"cidr": "{{ kube_pods_subnet }}",
"ipipMode": "{{ ipip_mode|capitalize }}",
"ipipMode": "{{ ipip_mode }}",
"natOutgoing": {{ nat_outgoing|default(false) and not peer_with_router|default(false) }} }} " | {{ bin_dir }}/calicoctl create -f -
run_once: true
delegate_to: "{{ groups['kube-master'][0] }}"
@ -186,4 +186,4 @@
register: calico_node_manifests
when:
- inventory_hostname in groups['kube-master']
- rbac_enabled or item.type not in rbac_resources
- rbac_enabled or item.type not in rbac_resources