Skip to content

Commit 674898b

Browse files
fix(calico): remove pinned version
Added migration docs Updated migration docs
1 parent c298653 commit 674898b

File tree

3 files changed

+25
-2
lines changed

3 files changed

+25
-2
lines changed

config/common/group_vars/k8s_cluster/ck8s-k8s-cluster.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ calico_ipip_mode: "Always"
5656
calico_vxlan_mode: "Never"
5757
calico_network_backend: "bird"
5858

59-
calico_version: v3.27.4
60-
6159
dns_extra_tolerations: [{effect: NoSchedule, operator: Exists}]
6260
coredns_additional_error_config: |
6361
consolidate 5m ".* i/o timeout$" warning

migration/v2.28/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333
> bin/ck8s-kubespray upgrade wc v2.28 prepare
3434
> ```
3535

36+
> [!IMPORTANT]
37+
> This upgrade removes the pinned Calico version (`calico_version: v3.27.4`) from your configuration, allowing Kubespray to use its default version (v3.29.1). This change fixes compatibility issues with calico-accountant in Calico v3.29.x. Ensure your compliantkubernetes-apps version is v0.48+ before proceeding with this upgrade.
38+
3639
1. Download the required files on the nodes
3740

3841
```bash
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#!/usr/bin/env bash
2+
3+
HERE="$(dirname "$(readlink -f "${0}")")"
4+
ROOT="$(readlink -f "${HERE}/../../../")"
5+
6+
# shellcheck source=scripts/migration/lib.sh
7+
source "${ROOT}/scripts/migration/lib.sh"
8+
9+
log_info "Removing calico_version pin to use Kubespray default (v3.29.x)"
10+
11+
if [[ "${CK8S_CLUSTER}" =~ ^(sc|both)$ ]]; then
12+
log_info "Removing calico_version from service cluster config"
13+
yq4 -i 'del(.calico_version)' "${CK8S_CONFIG_PATH}/sc-config/group_vars/k8s_cluster/ck8s-k8s-cluster.yaml"
14+
fi
15+
16+
if [[ "${CK8S_CLUSTER}" =~ ^(wc|both)$ ]]; then
17+
log_info "Removing calico_version from workload cluster config"
18+
yq4 -i 'del(.calico_version)' "${CK8S_CONFIG_PATH}/wc-config/group_vars/k8s_cluster/ck8s-k8s-cluster.yaml"
19+
fi
20+
21+
log_info "Calico will now use the default version from Kubespray (v3.29.1)"
22+
log_info "This change requires compliantkubernetes-apps version v0.47+ that supports Calico v3.29.x"

0 commit comments

Comments
 (0)