Merge pull request #3187 from tmjd/update-canal-2-4-1

Automatic merge from submit-queue Update Canal to the latest Update Calico and Flannel versions - Calico to v2.4.1 - Flannel to v0.8.0 The #3161 issue should be reviewed for the Default Deny NetworkPolicy behavior change this PR brings along.
kubernetes · Aug 17, 2017 · e3d6b15 · e3d6b15
2 parents 7274b60 + ec68c0c
commit e3d6b15
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 10 deletions.
diff --git a/.../models/cloudup/resources/addons/networking.projectcalico.org.canal/k8s-1.6.yaml.template b/.../models/cloudup/resources/addons/networking.projectcalico.org.canal/k8s-1.6.yaml.template
@@ -85,7 +85,7 @@ spec:
         # container programs network policy and routes on each
         # host.
         - name: calico-node
-          image: quay.io/calico/node:v1.3.0
+          image: quay.io/calico/node:v2.4.1
           env:
             # Use Kubernetes API as the backing datastore.
             - name: DATASTORE_TYPE
@@ -102,6 +102,9 @@ spec:
             # Don't enable BGP.
             - name: CALICO_NETWORKING_BACKEND
               value: "none"
+            # Cluster type to identify the deployment type
+            - name: CLUSTER_TYPE
+              value: "kops,canal"
             # Disable file logging so `kubectl logs` works.
             - name: CALICO_DISABLE_FILE_LOGGING
               value: "true"
@@ -132,7 +135,7 @@ spec:
         # This container installs the Calico CNI binaries
         # and CNI network config file on each node.
         - name: install-cni
-          image: quay.io/calico/cni:v1.9.1
+          image: quay.io/calico/cni:v1.10.0
           command: ["/install-cni.sh"]
           env:
             # The CNI network config to install on each node.
@@ -153,7 +156,7 @@ spec:
         # This container runs flannel using the kube-subnet-mgr backend
         # for allocating subnets.
         - name: kube-flannel
-          image: quay.io/coreos/flannel:v0.7.1
+          image: quay.io/coreos/flannel:v0.8.0
           command: [ "/opt/bin/flanneld", "--ip-masq", "--kube-subnet-mgr" ]
           securityContext:
             privileged: true
@@ -263,9 +266,16 @@ rules:
       - get
       - list
       - watch
+  - apiGroups: ["projectcalico.org"]
+    resources:
+      - globalbgppeers
+    verbs:
+      - get
+      - list
   - apiGroups: ["projectcalico.org"]
     resources:
       - globalconfigs
+      - globalbgpconfigs
     verbs:
       - create
       - get
@@ -277,11 +287,17 @@ rules:
       - ippools
     verbs:
       - create
-      - delete
       - get
       - list
       - update
       - watch
+  - apiGroups: ["alpha.projectcalico.org"]
+    resources:
+      - systemnetworkpolicies
+    verbs:
+      - get
+      - list
+      - watch
 
 ---
 

diff --git a/...els/cloudup/resources/addons/networking.projectcalico.org.canal/pre-k8s-1.6.yaml.template b/...els/cloudup/resources/addons/networking.projectcalico.org.canal/pre-k8s-1.6.yaml.template
@@ -77,7 +77,7 @@ spec:
         # container programs network policy and routes on each
         # host.
         - name: calico-node
-          image: quay.io/calico/node:v1.2.1
+          image: quay.io/calico/node:v2.4.1
           env:
             # Use Kubernetes API as the backing datastore.
             - name: DATASTORE_TYPE
@@ -94,6 +94,9 @@ spec:
             # Don't enable BGP.
             - name: CALICO_NETWORKING_BACKEND
               value: "none"
+            # Cluster type to identify the deployment type
+            - name: CLUSTER_TYPE
+              value: "kops,canal"
             # Disable file logging so `kubectl logs` works.
             - name: CALICO_DISABLE_FILE_LOGGING
               value: "true"
@@ -124,7 +127,7 @@ spec:
         # This container installs the Calico CNI binaries
         # and CNI network config file on each node.
         - name: install-cni
-          image: quay.io/calico/cni:v1.8.3
+          image: quay.io/calico/cni:v1.10.0
           command: ["/install-cni.sh"]
           env:
             # The CNI network config to install on each node.
@@ -145,7 +148,7 @@ spec:
         # This container runs flannel using the kube-subnet-mgr backend
         # for allocating subnets.
         - name: kube-flannel
-          image: quay.io/coreos/flannel:v0.7.1
+          image: quay.io/coreos/flannel:v0.8.0
           command: [ "/opt/bin/flanneld", "--ip-masq", "--kube-subnet-mgr" ]
           securityContext:
             privileged: true
@@ -194,4 +197,4 @@ spec:
             path: /run
         - name: flannel-cfg
           configMap:
-            name: canal-config
+            name: canal-config
diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
@@ -413,8 +413,8 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
 
 	if b.cluster.Spec.Networking.Canal != nil {
 		key := "networking.projectcalico.org.canal"
-		// Locking canal addon version to 1.3 (same as Calico node). Best to maintain lockstep for sanity
-		version := "1.3"
+		// Locking canal addon version to 2.4.1 (same as Calico node). Best to maintain lockstep for sanity
+		version := "2.4.1"
 
 		{
 			location := key + "/pre-k8s-1.6.yaml"