Merge pull request #60 from benmoss/flannel

Update flannel to release 0.12.0
kubernetes-sigs · Mar 24, 2020 · a4311b7 · a4311b7
2 parents 35aba36 + 403df1f
commit a4311b7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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: