kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1753 from heschlie/calico-2.0.2 

Calico 2.0.2 released, updating kops manifest
This commit is contained in:
Justin Santa Barbara 2017-02-11 11:22:22 -05:00 committed by GitHub
parent 991fc5bc7c 34c278e07f
commit c0c8471047
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
upup/models/cloudup/resources/addons/networking.projectcalico.org/v2.0.yaml.template
View File

@ -77,7 +77,7 @@ spec:
# container programs network policy and routes on each
# host.
- name: calico-node
image: calico/node:v1.0.1
image: calico/node:v1.0.2
resources:
requests:
cpu: 10m
@ -116,7 +116,7 @@ spec:
# This container installs the Calico CNI binaries
# and CNI network config file on each node.
- name: install-cni
image: calico/cni:v1.5.5
image: calico/cni:v1.5.6
resources:
requests:
cpu: 10m
@ -237,7 +237,7 @@ spec:
containers:
# Writes basic configuration to datastore.
- name: configure-calico
image: calico/ctl:v1.0.1
image: calico/ctl:v1.0.2
args:
- apply
- -f