From 0f40de4c12411d60e8270cf2e21770c4582aa335 Mon Sep 17 00:00:00 2001
From: Otto Yiu <otto@live.ca>
Date: Wed, 5 Apr 2017 04:29:27 -0700
Subject: [PATCH] Update Project Calico from 2.0.2 to 2.1.1

---
 .../{v2.0.2.yaml.template => v2.1.1.yaml.template}     | 10 +++++-----
 upup/pkg/fi/cloudup/bootstrapchannelbuilder.go         |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename upup/models/cloudup/resources/addons/networking.projectcalico.org/{v2.0.2.yaml.template => v2.1.1.yaml.template} (97%)

diff --git a/upup/models/cloudup/resources/addons/networking.projectcalico.org/v2.0.2.yaml.template b/upup/models/cloudup/resources/addons/networking.projectcalico.org/v2.1.1.yaml.template
similarity index 97%
rename from upup/models/cloudup/resources/addons/networking.projectcalico.org/v2.0.2.yaml.template
rename to upup/models/cloudup/resources/addons/networking.projectcalico.org/v2.1.1.yaml.template
index fbb6dc5034..c7a7c6581e 100644
--- a/upup/models/cloudup/resources/addons/networking.projectcalico.org/v2.0.2.yaml.template
+++ b/upup/models/cloudup/resources/addons/networking.projectcalico.org/v2.1.1.yaml.template
@@ -77,7 +77,7 @@ spec:
         # container programs network policy and routes on each
         # host.
         - name: calico-node
-          image: calico/node:v1.0.2
+          image: calico/node:v1.1.1
           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.6
+          image: calico/cni:v1.6.1
           resources:
             requests:
               cpu: 10m
@@ -189,7 +189,7 @@ spec:
       hostNetwork: true
       containers:
         - name: calico-policy-controller
-          image: calico/kube-policy-controller:v0.5.2
+          image: calico/kube-policy-controller:v0.5.4
           resources:
             requests:
               cpu: 10m
@@ -237,7 +237,7 @@ spec:
       containers:
         # Writes basic configuration to datastore.
         - name: configure-calico
-          image: calico/ctl:v1.0.2
+          image: calico/ctl:v1.1.1
           args:
           - apply
           - -f
@@ -258,4 +258,4 @@ spec:
            name: calico-config
            items:
             - key: ippool.yaml
-              path: calico/ippool.yaml
\ No newline at end of file
+              path: calico/ippool.yaml
diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
index fc32a3ce0b..f399e1b4f0 100644
--- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
+++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
@@ -243,7 +243,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
 
 	if b.cluster.Spec.Networking.Calico != nil {
 		key := "networking.projectcalico.org"
-		version := "2.0.2"
+		version := "2.1.1"
 
 		// TODO: Create configuration object for cni providers (maybe create it but orphan it)?
 		location := key + "/v" + version + ".yaml"