Skip to content

Commit d945927

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request kubernetes#53545 from heschlie/calico-update
Automatic merge from submit-queue (batch tested with PRs 54419, 53545). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Updating Calico to v2.6.1 **What this PR does / why we need it**: Updating Calico to the most recent release v2.6.1. [Release page](https://docs.projectcalico.org/v2.6/releases/) and [blog post](https://www.projectcalico.org/project-calico-2-6-released/) **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note ```
2 parents bcce1a0 + c4a8290 commit d945927

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

cluster/addons/calico-policy-controller/calico-node-daemonset.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ spec:
2929
# container programs network policy and routes on each
3030
# host.
3131
- name: calico-node
32-
image: calico/node:v2.5.1
32+
image: calico/node:v2.6.1
3333
env:
3434
- name: CALICO_DISABLE_FILE_LOGGING
3535
value: "true"
@@ -83,7 +83,7 @@ spec:
8383
# This container installs the Calico CNI binaries
8484
# and CNI network config file on each node.
8585
- name: install-cni
86-
image: calico/cni:v1.10.0
86+
image: calico/cni:v1.11.0
8787
command: ["/install-cni.sh"]
8888
env:
8989
- name: CNI_CONF_NAME

cluster/addons/calico-policy-controller/typha-deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
hostNetwork: true
2323
serviceAccountName: calico
2424
containers:
25-
- image: calico/typha:v0.4.1
25+
- image: calico/typha:v0.5.1
2626
name: calico-typha
2727
ports:
2828
- containerPort: 5473

0 commit comments

Comments
 (0)