mirror of https://github.com/kubernetes/kops.git
Update flannel to 0.7.1
Includes some important fixes for taints in 1.6
This commit is contained in:
parent
17ecc757f2
commit
ccee94ef72
|
@ -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:
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in New Issue