Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

calico_pool_blocksize must be cast as well in assertion when defined #8321

Merged
merged 2 commits into from
Dec 23, 2021
Merged

calico_pool_blocksize must be cast as well in assertion when defined #8321

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4752a3
calico_pool_blocksize must be cast as string in assertion when defined
emiran-orange Dec 20, 2021
0d8ff4b
Cast as int rather than string
emiran-orange Dec 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion roles/network_plugin/calico/tasks/check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
- name: "Check if inventory match current cluster configuration"
assert:
that:
- calico_pool_conf.spec.blockSize|string == (calico_pool_blocksize | default(kube_network_node_prefix | string))
- calico_pool_conf.spec.blockSize|int == (calico_pool_blocksize | default(kube_network_node_prefix) | int)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

calico_pool_conf.spec.blockSize is an integer as the following, the change itself seems good for me.

# calicoctl.sh get ipPool default-pool -o json
{
...
  },
  "spec": {
    "cidr": "10.233.64.0/18",
    "vxlanMode": "Always",
    "ipipMode": "Never",
    "natOutgoing": true,
    "blockSize": 24,
    "nodeSelector": "all()"
  }
}

- calico_pool_conf.spec.cidr == (calico_pool_cidr | default(kube_pods_subnet))
- 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
Expand Down