From 89032bf0bed50186ce8bd0da9266ad99c0a843e2 Mon Sep 17 00:00:00 2001
From: gjmzj <gaojianming.zj@139.com>
Date: Tue, 11 Jun 2019 23:09:26 +0800
Subject: [PATCH] update traefik v1.7.12

---
 manifests/ingress/traefik/tls/traefik-controller.yaml | 2 +-
 manifests/ingress/traefik/traefik-ingress.yaml        | 2 +-
 roles/flannel/defaults/main.yml                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/ingress/traefik/tls/traefik-controller.yaml b/manifests/ingress/traefik/tls/traefik-controller.yaml
index 7a8b4ee..8610357 100644
--- a/manifests/ingress/traefik/tls/traefik-controller.yaml
+++ b/manifests/ingress/traefik/tls/traefik-controller.yaml
@@ -54,7 +54,7 @@ spec:
       #nodeSelector:
       #  node-role.kubernetes.io/traefik: "true"
       containers:
-      - image: traefik:v1.7.11
+      - image: traefik:v1.7.12
         imagePullPolicy: IfNotPresent
         name: traefik-ingress-lb
         volumeMounts:
diff --git a/manifests/ingress/traefik/traefik-ingress.yaml b/manifests/ingress/traefik/traefik-ingress.yaml
index bf24645..c2d2577 100644
--- a/manifests/ingress/traefik/traefik-ingress.yaml
+++ b/manifests/ingress/traefik/traefik-ingress.yaml
@@ -64,7 +64,7 @@ spec:
       serviceAccountName: traefik-ingress-controller
       terminationGracePeriodSeconds: 60
       containers:
-      - image: traefik:v1.7.11
+      - image: traefik:v1.7.12
         imagePullPolicy: IfNotPresent
         name: traefik-ingress-lb
         args:
diff --git a/roles/flannel/defaults/main.yml b/roles/flannel/defaults/main.yml
index 258143b..af63d2b 100644
--- a/roles/flannel/defaults/main.yml
+++ b/roles/flannel/defaults/main.yml
@@ -9,7 +9,7 @@ NODE_WITH_MULTIPLE_NETWORKS: "true"
 FLANNEL_BACKEND: "vxlan"
 
 #flanneld_image: "quay.io/coreos/flannel:v0.10.0-amd64"
-flanneld_image: "jmgao1983/flannel:v0.11.0-amd64"
+flanneld_image: "easzlab/flannel:v0.11.0-amd64"
 
 # 离线镜像tar包
 flannel_offline: "flannel_v0.11.0-amd64.tar"