From 2cb94ff8d086a94bb60e34e4cf838c8bbe2591c7 Mon Sep 17 00:00:00 2001
From: gjmzj <gaojianming.zj@139.com>
Date: Fri, 15 Feb 2019 14:47:43 +0800
Subject: [PATCH] update flannel v0.11.0-amd64

---
 roles/flannel/defaults/main.yml              |  7 ++-----
 roles/flannel/templates/kube-flannel.yaml.j2 | 12 +++++-------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/roles/flannel/defaults/main.yml b/roles/flannel/defaults/main.yml
index 2309f9b..258143b 100644
--- a/roles/flannel/defaults/main.yml
+++ b/roles/flannel/defaults/main.yml
@@ -8,11 +8,8 @@ NODE_WITH_MULTIPLE_NETWORKS: "true"
 #FLANNEL_BACKEND: "host-gw"
 FLANNEL_BACKEND: "vxlan"
 
-#install_cni_image: "quay.io/coreos/flannel:v0.10.0-amd64"
-install_cni_image: "jmgao1983/flannel:v0.10.0-amd64"
-
 #flanneld_image: "quay.io/coreos/flannel:v0.10.0-amd64"
-flanneld_image: "jmgao1983/flannel:v0.10.0-amd64"
+flanneld_image: "jmgao1983/flannel:v0.11.0-amd64"
 
 # 离线镜像tar包
-flannel_offline: "flannel_v0.10.0-amd64.tar"
+flannel_offline: "flannel_v0.11.0-amd64.tar"
diff --git a/roles/flannel/templates/kube-flannel.yaml.j2 b/roles/flannel/templates/kube-flannel.yaml.j2
index c372318..21d701e 100644
--- a/roles/flannel/templates/kube-flannel.yaml.j2
+++ b/roles/flannel/templates/kube-flannel.yaml.j2
@@ -1,6 +1,6 @@
 ---
 kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1
+apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: flannel
 rules:
@@ -25,7 +25,7 @@ rules:
       - patch
 ---
 kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
+apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: flannel
 roleRef:
@@ -82,7 +82,7 @@ data:
 apiVersion: extensions/v1beta1
 kind: DaemonSet
 metadata:
-  name: kube-flannel-ds
+  name: kube-flannel-ds-amd64
   namespace: kube-system
   labels:
     tier: node
@@ -98,13 +98,12 @@ spec:
       nodeSelector:
         beta.kubernetes.io/arch: amd64
       tolerations:
-      - key: node-role.kubernetes.io/master
-        operator: Exists
+      - operator: Exists
         effect: NoSchedule
       serviceAccountName: flannel
       initContainers:
       - name: install-cni
-        image: {{ install_cni_image }} 
+        image: {{ flanneld_image }} 
         command:
         - cp
         args:
@@ -124,7 +123,6 @@ spec:
         args:
         - --ip-masq
         - --kube-subnet-mgr
-        #- --iface=eth1
         resources:
           requests:
             cpu: "100m"