Add Calico v3.10.2

upup/models/cloudup/resources/addons/networking.projectcalico.org.canal/k8s-1.15.yaml.template

@@ -1,10 +1,10 @@
-# Canal Version v3.10.1
+# Canal Version v3.10.2
 # https://docs.projectcalico.org/v3.10/release-notes/#v3101
 # This manifest includes the following component versions:
-#   calico/cni:v3.10.1
-#   calico/node:v3.10.1
-#   calico/pod2daemon-flexvol:v3.10.1
-#   calico/typha:v3.10.1
+#   calico/cni:v3.10.2
+#   calico/node:v3.10.2
+#   calico/pod2daemon-flexvol:v3.10.2
+#   calico/typha:v3.10.2
 #   quay.io/coreos/flannel:v0.11.0
 
 # Source: calico/templates/calico-config.yaml
@@ -520,7 +520,7 @@ spec:
       securityContext:
         fsGroup: 65534
       containers:
-      - image: calico/typha:v3.10.1
+      - image: calico/typha:v3.10.2
         name: calico-typha
         ports:
         - containerPort: 5473
@@ -634,7 +634,7 @@ spec:
         # This container installs the Calico CNI binaries
         # and CNI network config file on each node.
         - name: install-cni
-          image: calico/cni:v3.10.1
+          image: calico/cni:v3.10.2
           command: ["/install-cni.sh"]
           env:
             # Name of the CNI config file to create.
@@ -668,7 +668,7 @@ spec:
         # Adds a Flex Volume Driver that creates a per-pod Unix Domain Socket to allow Dikastes
         # to communicate with Felix over the Policy Sync API.
         - name: flexvol-driver
-          image: calico/pod2daemon-flexvol:v3.10.1
+          image: calico/pod2daemon-flexvol:v3.10.2
           volumeMounts:
           - name: flexvol-driver-host
             mountPath: /host/driver
@@ -677,7 +677,7 @@ spec:
         # container programs network policy and routes on each
         # host.
         - name: calico-node
-          image: calico/node:v3.10.1
+          image: calico/node:v3.10.2
           env:
             # Use Kubernetes API as the backing datastore.
             - name: DATASTORE_TYPE

upup/pkg/fi/cloudup/bootstrapchannelbuilder.go

@@ -829,6 +829,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
 			"k8s-1.7":     "2.6.12-kops.1",
 			"k8s-1.7-v3":  "3.8.0-kops.2",
 			"k8s-1.12":    "3.9.3-kops.2",
+			"k8s-1.16":    "3.10.2-kops.1",
 		}
 
 		{
@@ -840,7 +841,21 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
 				Version:           fi.String(versions[id]),
 				Selector:          networkingSelector,
 				Manifest:          fi.String(location),
-				KubernetesVersion: ">=1.12.0",
+				KubernetesVersion: ">=1.12.0 <1.16.0",
+				Id:                id,
+			})
+		}
+
+		{
+			id := "k8s-1.16"
+			location := key + "/" + id + ".yaml"
+
+			addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{
+				Name:              fi.String(key),
+				Version:           fi.String(versions[id]),
+				Selector:          networkingSelector,
+				Manifest:          fi.String(location),
+				KubernetesVersion: ">=1.16.0",
 				Id:                id,
 			})
 		}
@@ -911,8 +926,8 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
 			"k8s-1.6":     "2.4.2-kops.2",
 			"k8s-1.8":     "2.6.7-kops.3",
 			"k8s-1.9":     "3.2.3-kops.1",
-			"k8s-1.12":    "3.7.4",
-			"k8s-1.15":    "3.10.1-kops.2",
+			"k8s-1.12":    "3.7.4-kops.1",
+			"k8s-1.15":    "3.10.2-kops.1",
 		}
 		{
 			id := "pre-k8s-1.6"