Skip to content

Commit

Permalink
Merge pull request #58831 from tmjd/automated-cherry-pick-of-#58482-b…
Browse files Browse the repository at this point in the history
…ase-release-1.7

Automatic merge from submit-queue.

Automated cherry pick of #58482

Cherry pick of #58482 on release-1.7.

#58482: Update cluster addon Calico to v2.6.6
  • Loading branch information
Kubernetes Submit Queue authored Jan 30, 2018
2 parents 36750af + d9dba56 commit 63674b0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ spec:
# container programs network policy and routes on each
# host.
- name: calico-node
image: calico/node:v2.5.1
image: gcr.io/projectcalico-org/node:v2.6.6
env:
- name: CALICO_DISABLE_FILE_LOGGING
value: "true"
Expand Down Expand Up @@ -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: gcr.io/projectcalico-org/cni:v1.11.2
command: ["/install-cni.sh"]
env:
- name: CNI_CONF_NAME
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
hostNetwork: true
serviceAccountName: calico
containers:
- image: calico/typha:v0.4.1
- image: gcr.io/projectcalico-org/typha:v0.5.5
name: calico-typha
ports:
- containerPort: 5473
Expand Down

0 comments on commit 63674b0

Please sign in to comment.