Merge pull request #59132 from caseydavenport/automated-cherry-pick-o…

…f-#59130-upstream-release-1.8 Automatic merge from submit-queue. Automated cherry pick of #59130: Update Calico to version v2.6.7 Cherry pick of #59130 on release-1.8. #59130: Update Calico to version v2.6.7
kubernetes · Feb 2, 2018 · 60b7889 · 60b7889
2 parents b7b212b + 2cbff06
commit 60b7889
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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: gcr.io/projectcalico-org/node:v2.6.6
+          image: gcr.io/projectcalico-org/node:v2.6.7
           env:
             - name: CALICO_DISABLE_FILE_LOGGING
               value: "true"

diff --git 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: gcr.io/projectcalico-org/typha:v0.5.5
+      - image: gcr.io/projectcalico-org/typha:v0.5.6
         name: calico-typha
         ports:
         - containerPort: 5473