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 ```

Merge pull request #53545 from heschlie/calico-update
d9459270 · Kubernetes Submit Queue · GitHub · bcce1a02 · c4a82903 · d9459270
Commit d9459270 authored Oct 27, 2017 by Kubernetes Submit Queue Committed by GitHub Oct 27, 2017
Showing with 3 additions and 3 deletions

calico-node-daemonset.yaml ...ddons/calico-policy-controller/calico-node-daemonset.yaml +2 -2

typha-deployment.yaml ...ter/addons/calico-policy-controller/typha-deployment.yaml +1 -1

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

--- a/cluster/addons/calico-policy-controller/typha-deployment.yaml
+++ b/cluster/addons/calico-policy-controller/typha-deployment.yaml
@@ -22,7 +22,7 @@ spec:
      hostNetwork: true
      serviceAccountName: calico
      containers:
-      - image: calico/typha:v0.4.1
+      - image: calico/typha:v0.5.1
        name: calico-typha
        ports:
        - containerPort: 5473