C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Calico: fixup check when ipipMode / vxlanMode is not present

Browse source 
calicoctl.sh get ipPool default-pool -o json
{
  "kind": "IPPool",
  "apiVersion": "projectcalico.org/v3",
  "metadata": {
    "name": "default-pool",
...
  },
  "spec": {
    "cidr": "10.233.64.0/18",
    "ipipMode": "Always",
    "natOutgoing": true,
    "blockSize": 24,
    "nodeSelector": "all()"
  }
}

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
(cherry picked from commit f1576eabb1)
This commit is contained in:
Etienne Champetier 2021-01-21 23:39:26 -05:00 committed by Kubernetes Prow Robot
parent 8105cd7fbe
commit 4ed05cf655
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
roles/network_plugin/calico/tasks/check.yml
View file

@ -55,8 +55,8 @@
that: that:
- calico_pool_conf.spec.blockSize == (calico_pool_blocksize | default(kube_network_node_prefix)) - calico_pool_conf.spec.blockSize == (calico_pool_blocksize | default(kube_network_node_prefix))
- calico_pool_conf.spec.cidr == (calico_pool_cidr | default(kube_pods_subnet)) - calico_pool_conf.spec.cidr == (calico_pool_cidr | default(kube_pods_subnet))
- calico_pool_conf.spec.ipipMode == calico_ipip_mode - not calico_pool_conf.spec.ipipMode is defined or calico_pool_conf.spec.ipipMode == calico_ipip_mode
- calico_pool_conf.spec.vxlanMode == calico_vxlan_mode - not calico_pool_conf.spec.vxlanMode is defined or calico_pool_conf.spec.vxlanMode == calico_vxlan_mode
msg: "Your inventory doesn't match the current cluster configuration" msg: "Your inventory doesn't match the current cluster configuration"
when: when:
- calico_pool_conf is defined - calico_pool_conf is defined