Browse Source
Calico: fixup check when ipipMode / vxlanMode is not present (#7195)
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>
pull/7204/head
Etienne Champetier
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
2 additions and
2 deletions
-
roles/network_plugin/calico/tasks/check.yml
|
|
@ -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 |
|
|
|
|
|
- calico_pool_conf.spec.vxlanMode == calico_vxlan_mode |
|
|
|
|
|
|
|
|
- not calico_pool_conf.spec.ipipMode is defined or calico_pool_conf.spec.ipipMode == calico_ipip_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 |
