From cd617347b53f0ad5c71213c2cfc2377a055b6ef2d768ddc7c84cbc759b202c83 Mon Sep 17 00:00:00 2001
From: Thorsten Kukuk <kukuk@suse.com>
Date: Mon, 17 Aug 2020 09:02:07 +0000
Subject: [PATCH] Accepting request 827073 from
 home:dirkmueller:branches:devel:kubic

- update to 0.12.0:
  * fix deleteLease
  * Use publicIP lookup iface if --public-ip indicated
  * kubernetes 1.16 cni error
  * Add cniVersion to general CNI plugin configuration.
  * Needs to clear NodeNetworkUnavailable flag on Kubernetes
  * Replaces gorillalabs go-powershell with bhendo/go-powershell
  * Make VXLAN device learning attribute configurable
  * change nodeSelector to nodeAffinity and schedule the pod to linux node
  * This PR adds the cni version to the cni-conf.yaml inside the kube-flannel-cfg configmap
  * EnableNonPersistent flag for Windows Overlay networks
  * snap package.
  * Update lease with DR Mac
  * main.go: add the "net-config-path" flag
  * Deploy Flannel with unprivileged PSP
  * Enable local host to local pod connectivity in Windows VXLAN
  * Update hcsshim for HostRoute policy in Windows VXLAN

OBS-URL: https://build.opensuse.org/request/show/827073
OBS-URL: https://build.opensuse.org/package/show/devel:kubic/flannel?expand=0&rev=11
---
 flannel-0.11.0.tar.gz |  3 ---
 flannel.changes       | 21 +++++++++++++++++++++
 flannel.spec          |  8 +++-----
 v0.12.0.tar.gz        |  3 +++
 4 files changed, 27 insertions(+), 8 deletions(-)
 delete mode 100644 flannel-0.11.0.tar.gz
 create mode 100644 v0.12.0.tar.gz

diff --git a/flannel-0.11.0.tar.gz b/flannel-0.11.0.tar.gz
deleted file mode 100644
index bcbe6bf..0000000
--- a/flannel-0.11.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:476c886ddc06a8afcf54e181ac55579224c6be424089567a0b8d9e93dd08a053
-size 6443391
diff --git a/flannel.changes b/flannel.changes
index 2745401..07bc055 100644
--- a/flannel.changes
+++ b/flannel.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Sun Aug 16 17:14:50 UTC 2020 - Dirk Mueller <dmueller@suse.com>
+
+- update to 0.12.0:
+  * fix deleteLease
+  * Use publicIP lookup iface if --public-ip indicated
+  * kubernetes 1.16 cni error
+  * Add cniVersion to general CNI plugin configuration.
+  * Needs to clear NodeNetworkUnavailable flag on Kubernetes
+  * Replaces gorillalabs go-powershell with bhendo/go-powershell
+  * Make VXLAN device learning attribute configurable
+  * change nodeSelector to nodeAffinity and schedule the pod to linux node
+  * This PR adds the cni version to the cni-conf.yaml inside the kube-flannel-cfg configmap
+  * EnableNonPersistent flag for Windows Overlay networks
+  * snap package.
+  * Update lease with DR Mac
+  * main.go: add the "net-config-path" flag
+  * Deploy Flannel with unprivileged PSP
+  * Enable local host to local pod connectivity in Windows VXLAN
+  * Update hcsshim for HostRoute policy in Windows VXLAN
+
 -------------------------------------------------------------------
 Tue Oct 29 13:30:38 UTC 2019 - Guillaume GARDET <guillaume.gardet@opensuse.org>
 
diff --git a/flannel.spec b/flannel.spec
index 8fa237c..99b5650 100644
--- a/flannel.spec
+++ b/flannel.spec
@@ -24,22 +24,20 @@
 %define flannel_container_path registry.opensuse.org/kubic/flannel
 
 Name:           flannel
-Version:        0.11.0
+Version:        0.12.0
 Release:        0
 Summary:        An etcd backed network fabric for containers
 License:        Apache-2.0
 Group:          System/Management
 Url:            https://github.com/coreos/flannel
-Source:         %{name}-%{version}.tar.gz
+Source:         https://github.com/coreos/flannel/archive/v%{version}.tar.gz
 Source1:        kube-flannel.yaml
 Requires:       iproute2
 # arp is used:
 Requires:       net-tools-deprecated
 Requires:       iptables
 BuildRequires:  golang-packaging
-BuildRequires:  golang(API) >= 1.11
-# go1.11.3 contains sec. fixes bsc#1118897(CVE-2018-16873) bsc#1118897(CVE-2018-16873) bsc#1118899(CVE-2018-16875)
-BuildRequires:  go1.11 >= 1.11.3
+BuildRequires:  golang(API) >= 1.12
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExcludeArch:    s390
 %{go_nostrip}
diff --git a/v0.12.0.tar.gz b/v0.12.0.tar.gz
new file mode 100644
index 0000000..2327d58
--- /dev/null
+++ b/v0.12.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7375318b288bcff733aabfe1a1007d478cb9091cdaffe68c8253ddd93bc070ed
+size 6107934