Merge pull request #7273 from justinsb/cherrypick_7206_release-1.13

Cherry pick of #7206: Canal v3.7.4
kubernetes · Jul 19, 2019 · 722ecec · 722ecec
2 parents 005bd4c + f9e0c88
commit 722ecec
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/...models/cloudup/resources/addons/networking.projectcalico.org.canal/k8s-1.12.yaml.template b/...models/cloudup/resources/addons/networking.projectcalico.org.canal/k8s-1.12.yaml.template
@@ -1,8 +1,8 @@
-# Canal Version v3.7.2
-# https://docs.projectcalico.org/v3.7/release-notes/#v372
+# Canal Version v3.7.4
+# https://docs.projectcalico.org/v3.7/release-notes/#v374
 # This manifest includes the following component versions:
-#   calico/node:v3.7.2
-#   calico/cni:v3.7.2
+#   calico/node:v3.7.4
+#   calico/cni:v3.7.4
 #   coreos/flannel:v0.11.0
 
 # Source: calico/templates/calico-config.yaml
@@ -411,7 +411,7 @@ spec:
         # This container installs the Calico CNI binaries
         # and CNI network config file on each node.
         - name: install-cni
-          image: calico/cni:v3.7.2
+          image: calico/cni:v3.7.4
           command: ["/install-cni.sh"]
           env:
             # Name of the CNI config file to create.
@@ -447,7 +447,7 @@ spec:
         # container programs network policy and routes on each
         # host.
         - name: calico-node
-          image: calico/node:v3.7.2
+          image: calico/node:v3.7.4
           env:
             # Use Kubernetes API as the backing datastore.
             - name: DATASTORE_TYPE

diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
@@ -898,7 +898,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
 			"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.2",
+			"k8s-1.12":    "3.7.4",
 		}
 		{
 			id := "pre-k8s-1.6"