From ccee94ef7269ec09e1cfc35f60ddfba368400124 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Sat, 29 Apr 2017 11:12:13 -0400 Subject: [PATCH] Update flannel to 0.7.1 Includes some important fixes for taints in 1.6 --- .../cloudup/resources/addons/networking.flannel/k8s-1.6.yaml | 4 ++-- .../resources/addons/networking.flannel/pre-k8s-1.6.yaml | 4 ++-- upup/pkg/fi/cloudup/bootstrapchannelbuilder.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/upup/models/cloudup/resources/addons/networking.flannel/k8s-1.6.yaml b/upup/models/cloudup/resources/addons/networking.flannel/k8s-1.6.yaml index 3d577537fa..5fefab1e0c 100644 --- a/upup/models/cloudup/resources/addons/networking.flannel/k8s-1.6.yaml +++ b/upup/models/cloudup/resources/addons/networking.flannel/k8s-1.6.yaml @@ -57,7 +57,7 @@ spec: key: node-role.kubernetes.io/master containers: - name: kube-flannel - image: quay.io/coreos/flannel:v0.7.0 + image: quay.io/coreos/flannel:v0.7.1 command: [ "/opt/bin/flanneld", "--ip-masq", "--kube-subnet-mgr" ] securityContext: privileged: true @@ -83,7 +83,7 @@ spec: - name: flannel-cfg mountPath: /etc/kube-flannel/ - name: install-cni - image: quay.io/coreos/flannel:v0.7.0 + image: quay.io/coreos/flannel:v0.7.1 command: [ "/bin/sh", "-c", "set -e -x; cp -f /etc/kube-flannel/cni-conf.json /etc/cni/net.d/10-flannel.conf; while true; do sleep 3600; done" ] resources: limits: diff --git a/upup/models/cloudup/resources/addons/networking.flannel/pre-k8s-1.6.yaml b/upup/models/cloudup/resources/addons/networking.flannel/pre-k8s-1.6.yaml index 144ede4bd9..6679def905 100644 --- a/upup/models/cloudup/resources/addons/networking.flannel/pre-k8s-1.6.yaml +++ b/upup/models/cloudup/resources/addons/networking.flannel/pre-k8s-1.6.yaml @@ -54,7 +54,7 @@ spec: serviceAccountName: flannel containers: - name: kube-flannel - image: quay.io/coreos/flannel:v0.7.0 + image: quay.io/coreos/flannel:v0.7.1 command: [ "/opt/bin/flanneld", "--ip-masq", "--kube-subnet-mgr" ] securityContext: privileged: true @@ -80,7 +80,7 @@ spec: - name: flannel-cfg mountPath: /etc/kube-flannel/ - name: install-cni - image: quay.io/coreos/flannel:v0.7.0 + image: quay.io/coreos/flannel:v0.7.1 command: [ "/bin/sh", "-c", "set -e -x; cp -f /etc/kube-flannel/cni-conf.json /etc/cni/net.d/10-flannel.conf; while true; do sleep 3600; done" ] resources: limits: diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go index 77fa7aff22..ed282f00ff 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go @@ -276,7 +276,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri if b.cluster.Spec.Networking.Flannel != nil { key := "networking.flannel" - version := "0.7.0" + version := "0.7.1" { location := key + "/pre-k8s-1.6.yaml"