Skip to content

Commit f2715e1

Browse files
authored
Merge pull request #2298 from k8s-infra-cherrypick-robot/cherry-pick-2297-to-release-1.3
[release-1.3] Upgrade to calico 3.23.0
2 parents a2be7c8 + 10347b2 commit f2715e1

20 files changed

+4297
-518
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ generate-addons: fetch-calico-manifests ## Generate metric-server, calico calico
467467
$(KUSTOMIZE) build $(ADDONS_DIR)/calico-dual-stack > $(ADDONS_DIR)/calico-dual-stack.yaml
468468

469469
# When updating this, make sure to also update the Windows image version in templates/addons/windows/calico.
470-
CALICO_VERSION := v3.22.1
470+
CALICO_VERSION := v3.23.0
471471

472472
.PHONY: fetch-calico-manifests
473473
fetch-calico-manifests: ## Get Calico release manifests and unzip them.

templates/addons/calico-dual-stack.yaml

Lines changed: 236 additions & 27 deletions
Large diffs are not rendered by default.

templates/addons/calico-ipv6.yaml

Lines changed: 236 additions & 27 deletions
Large diffs are not rendered by default.

templates/addons/calico-ipv6/calico-policy-only.yaml

Lines changed: 241 additions & 37 deletions
Large diffs are not rendered by default.

templates/addons/calico.yaml

Lines changed: 237 additions & 26 deletions
Large diffs are not rendered by default.

templates/addons/calico/calico-vxlan.yaml

Lines changed: 243 additions & 36 deletions
Large diffs are not rendered by default.

templates/addons/windows/calico/calico.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ spec:
163163
# This container installs the CNI binaries
164164
# and CNI network config file on each node.
165165
- name: install-cni
166-
image: sigwindowstools/calico-install:v3.22.1-hostprocess
166+
image: sigwindowstools/calico-install:v3.23.0-hostprocess
167167
args: ["$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/install.ps1"]
168168
imagePullPolicy: Always
169169
env:
@@ -205,7 +205,7 @@ spec:
205205
runAsUserName: "NT AUTHORITY\\system"
206206
containers:
207207
- name: calico-node-startup
208-
image: sigwindowstools/calico-node:v3.22.1-hostprocess
208+
image: sigwindowstools/calico-node:v3.23.0-hostprocess
209209
args: ["$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/node-service.ps1"]
210210
workingDir: "$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/"
211211
imagePullPolicy: Always
@@ -232,7 +232,7 @@ spec:
232232
- name: VXLAN_VNI
233233
value: "4096"
234234
- name: calico-node-felix
235-
image: sigwindowstools/calico-node:v3.22.1-hostprocess
235+
image: sigwindowstools/calico-node:v3.23.0-hostprocess
236236
args: ["$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/felix-service.ps1"]
237237
imagePullPolicy: Always
238238
workingDir: "$env:CONTAINER_SANDBOX_MOUNT_POINT/calico/"

templates/test/ci/cluster-template-prow-ci-version-windows-containerd-2022.yaml

Lines changed: 240 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/test/ci/cluster-template-prow-ci-version.yaml

Lines changed: 240 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/test/ci/cluster-template-prow-custom-vnet.yaml

Lines changed: 237 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)