From 1e10aecd7caaba920afc96b6def1d65c9a7bb559 Mon Sep 17 00:00:00 2001 From: Cecile Robert-Michon Date: Thu, 1 Jun 2023 18:50:28 +0000 Subject: [PATCH] Bump Calico to v3.26.1 --- Makefile | 2 +- docs/book/src/topics/addons.md | 6 +- templates/addons/calico-dual-stack.yaml | 197 ++- templates/addons/calico-ipv6.yaml | 197 ++- .../calico-ipv6/calico-policy-only.yaml | 202 ++- templates/addons/calico.yaml | 213 ++- templates/addons/calico/calico-vxlan.yaml | 217 ++- templates/addons/windows/calico/calico.yaml | 6 +- ...ow-ci-version-windows-containerd-2022.yaml | 1179 +++++++++++++++++ .../ci/cluster-template-prow-ci-version.yaml | 6 +- ...ow-intree-cloud-provider-machine-pool.yaml | 6 +- ...r-template-prow-intree-cloud-provider.yaml | 6 +- ...template-prow-machine-pool-ci-version.yaml | 6 +- ...uster-template-prow-machine-pool-flex.yaml | 6 +- .../cluster-template-prow-machine-pool.yaml | 6 +- .../ci/cluster-template-prow-private.yaml | 213 ++- .../ci/cluster-template-prow-topology.yaml | 6 +- templates/test/ci/cluster-template-prow.yaml | 6 +- ...r-template-custom-builds-machine-pool.yaml | 6 +- .../dev/cluster-template-custom-builds.yaml | 6 +- test/e2e/azure_logcollector.go | 4 + 21 files changed, 2409 insertions(+), 87 deletions(-) create mode 100644 templates/test/ci/cluster-template-prow-ci-version-windows-containerd-2022.yaml diff --git a/Makefile b/Makefile index 35ad9e5efd0..3927c5f413b 100644 --- a/Makefile +++ b/Makefile @@ -495,7 +495,7 @@ generate-aso-crds: $(YQ) > $(ASO_CRDS_PATH) # When updating this, make sure to also update the Windows image version in templates/addons/windows/calico. -export CALICO_VERSION := v3.25.1 +export CALICO_VERSION := v3.26.1 # Where all downloaded Calico manifests are unpacked and stored. CALICO_RELEASES := $(ARTIFACTS)/calico # Path to manifests directory in a Calico release archive. diff --git a/docs/book/src/topics/addons.md b/docs/book/src/topics/addons.md index 6b6255f9a9e..cc142f1cd13 100644 --- a/docs/book/src/topics/addons.md +++ b/docs/book/src/topics/addons.md @@ -29,7 +29,7 @@ Then install the Helm chart on the workload cluster: ```bash helm repo add projectcalico https://docs.tigera.io/calico/charts && \ -helm install calico projectcalico/tigera-operator --version v3.25.1 -f https://raw.githubusercontent.com/kubernetes-sigs/cluster-api-provider-azure/main/templates/addons/calico/values.yaml --set-string "installation.calicoNetwork.ipPools[0].cidr=${IPV4_CIDR_BLOCK}" --namespace tigera-operator --create-namespace +helm install calico projectcalico/tigera-operator --version v3.26.1 -f https://raw.githubusercontent.com/kubernetes-sigs/cluster-api-provider-azure/main/templates/addons/calico/values.yaml --set-string "installation.calicoNetwork.ipPools[0].cidr=${IPV4_CIDR_BLOCK}" --namespace tigera-operator --create-namespace ``` ### For IPv6 Clusters @@ -44,7 +44,7 @@ Then install the Helm chart on the workload cluster: ```bash helm repo add projectcalico https://docs.tigera.io/calico/charts && \ -helm install calico projectcalico/tigera-operator --version v3.25.1 -f https://raw.githubusercontent.com/kubernetes-sigs/cluster-api-provider-azure/main/templates/addons/calico-ipv6/values.yaml --set-string "installation.calicoNetwork.ipPools[0].cidr=${IPV6_CIDR_BLOCK}" --namespace tigera-operator --create-namespace +helm install calico projectcalico/tigera-operator --version v3.26.1 -f https://raw.githubusercontent.com/kubernetes-sigs/cluster-api-provider-azure/main/templates/addons/calico-ipv6/values.yaml --set-string "installation.calicoNetwork.ipPools[0].cidr=${IPV6_CIDR_BLOCK}" --namespace tigera-operator --create-namespace ``` ### For Dual-Stack Clusters @@ -60,7 +60,7 @@ Then install the Helm chart on the workload cluster: ```bash helm repo add projectcalico https://docs.tigera.io/calico/charts && \ -helm install calico projectcalico/tigera-operator --version v3.25.1 -f https://raw.githubusercontent.com/kubernetes-sigs/cluster-api-provider-azure/main/templates/addons/calico-dual-stack/values.yaml --set-string "installation.calicoNetwork.ipPools[0].cidr=${IPV4_CIDR_BLOCK}","installation.calicoNetwork.ipPools[1].cidr=${IPV6_CIDR_BLOCK}" --namespace tigera-operator --create-namespace +helm install calico projectcalico/tigera-operator --version v3.26.1 -f https://raw.githubusercontent.com/kubernetes-sigs/cluster-api-provider-azure/main/templates/addons/calico-dual-stack/values.yaml --set-string "installation.calicoNetwork.ipPools[0].cidr=${IPV4_CIDR_BLOCK}","installation.calicoNetwork.ipPools[1].cidr=${IPV6_CIDR_BLOCK}" --namespace tigera-operator --create-namespace ```