Merge pull request #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
```
pull/6/head
Kubernetes Submit Queue 2017-10-27 00:14:22 -07:00 committed by GitHub
commit d945927077
2 changed files with 3 additions and 3 deletions

View File

@ -29,7 +29,7 @@ spec:
# container programs network policy and routes on each # container programs network policy and routes on each
# host. # host.
- name: calico-node - name: calico-node
image: calico/node:v2.5.1 image: calico/node:v2.6.1
env: env:
- name: CALICO_DISABLE_FILE_LOGGING - name: CALICO_DISABLE_FILE_LOGGING
value: "true" value: "true"
@ -83,7 +83,7 @@ spec:
# This container installs the Calico CNI binaries # This container installs the Calico CNI binaries
# and CNI network config file on each node. # and CNI network config file on each node.
- name: install-cni - name: install-cni
image: calico/cni:v1.10.0 image: calico/cni:v1.11.0
command: ["/install-cni.sh"] command: ["/install-cni.sh"]
env: env:
- name: CNI_CONF_NAME - name: CNI_CONF_NAME

View File

@ -22,7 +22,7 @@ spec:
hostNetwork: true hostNetwork: true
serviceAccountName: calico serviceAccountName: calico
containers: containers:
- image: calico/typha:v0.4.1 - image: calico/typha:v0.5.1
name: calico-typha name: calico-typha
ports: ports:
- containerPort: 5473 - containerPort: 5473