Merge pull request #705 from dghubble/bump-flannel-cni

pkg/asset: Update flannel-cni from v0.2.0 to v0.3.0
kubernetes-retired · Sep 12, 2017 · 4dd7a4a · 4dd7a4a
2 parents 172addf + ab4eb2a
commit 4dd7a4a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/pkg/asset/images.go b/pkg/asset/images.go
@@ -5,7 +5,7 @@ var DefaultImages = ImageVersions{
 	Etcd:            "quay.io/coreos/etcd:v3.1.8",
 	EtcdOperator:    "quay.io/coreos/etcd-operator:v0.5.0",
 	Flannel:         "quay.io/coreos/flannel:v0.8.0-amd64",
-	FlannelCNI:      "quay.io/coreos/flannel-cni:v0.2.0",
+	FlannelCNI:      "quay.io/coreos/flannel-cni:v0.3.0",
 	Calico:          "quay.io/calico/node:v2.5.1",
 	CalicoCNI:       "quay.io/calico/cni:v1.10.0",
 	Hyperkube:       "quay.io/coreos/hyperkube:v1.7.5_coreos.0",

diff --git a/pkg/asset/internal/templates.go b/pkg/asset/internal/templates.go
@@ -1129,6 +1129,8 @@ spec:
         image: {{ .Images.FlannelCNI }}
         command: ["/install-cni.sh"]
         env:
+        - name: CNI_CONF_NAME
+          value: "10-flannel.conf"
         - name: CNI_NETWORK_CONFIG
           valueFrom:
             configMapKeyRef: