From 2b5c185826a854f624f4412c181a369da9301550 Mon Sep 17 00:00:00 2001
From: emiran-orange <71817149+emiran-orange@users.noreply.github.com>
Date: Thu, 23 Dec 2021 09:58:37 +0100
Subject: [PATCH] calico_pool_blocksize must be cast as well in assertion when
defined (#8321)
* calico_pool_blocksize must be cast as string in assertion when defined
* Cast as int rather than string
---
roles/network_plugin/calico/tasks/check.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/roles/network_plugin/calico/tasks/check.yml b/roles/network_plugin/calico/tasks/check.yml
index 8d72448b8..4134944be 100644
--- a/roles/network_plugin/calico/tasks/check.yml
+++ b/roles/network_plugin/calico/tasks/check.yml
@@ -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)
- 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
--
GitLab