From 403df1f92c7f8d6c5a6ff6142e2fd160f7f52c68 Mon Sep 17 00:00:00 2001
From: Ben Moss <ben@mossity.com>
Date: Tue, 24 Mar 2020 14:48:52 -0400
Subject: [PATCH] Update flannel to release 0.12.0

---
 kubeadm/flannel/Dockerfile          | 3 +--
 kubeadm/flannel/flannel-host-gw.yml | 2 +-
 kubeadm/flannel/flannel-overlay.yml | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/kubeadm/flannel/Dockerfile b/kubeadm/flannel/Dockerfile
index cbf22caa..09690ff8 100644
--- a/kubeadm/flannel/Dockerfile
+++ b/kubeadm/flannel/Dockerfile
@@ -11,10 +11,9 @@ SHELL ["powershell", "-NoLogo", "-Command", "$ErrorActionPreference = 'Stop'; $P
 
 ARG cniVersion
 
-# Stuck on a prerelease flannel until https://github.com/coreos/flannel/issues/1231 is resolved
 RUN mkdir -force C:\k\flannel; \
   pushd C:\k\flannel; \
-  curl.exe -LO https://github.com/benmoss/flannel/releases/download/v0.12.0-rc1/flanneld.exe
+  curl.exe -LO https://github.com/coreos/flannel/releases/download/v0.12.0/flanneld.exe
 
 ADD hns.psm1 /k/flannel
 COPY --from=builder /gopath/build/setup.exe /k/flannel/setup.exe
diff --git a/kubeadm/flannel/flannel-host-gw.yml b/kubeadm/flannel/flannel-host-gw.yml
index 5a1b6819..2d0acdc7 100644
--- a/kubeadm/flannel/flannel-host-gw.yml
+++ b/kubeadm/flannel/flannel-host-gw.yml
@@ -113,7 +113,7 @@ spec:
         effect: NoSchedule
       containers:
       - name: kube-flannel
-        image: sigwindowstools/flannel:0.12.0-rc2
+        image: sigwindowstools/flannel:0.12.0
         command:
         - powershell
         args:
diff --git a/kubeadm/flannel/flannel-overlay.yml b/kubeadm/flannel/flannel-overlay.yml
index d6c3273f..b53c7ca1 100644
--- a/kubeadm/flannel/flannel-overlay.yml
+++ b/kubeadm/flannel/flannel-overlay.yml
@@ -102,7 +102,7 @@ spec:
         effect: NoSchedule
       containers:
       - name: kube-flannel
-        image: sigwindowstools/flannel:0.12.0-rc2
+        image: sigwindowstools/flannel:0.12.0
         command:
         - powershell
         args: