From 95dbd2dabc7b84538e56bdb0ad06edcfdbe1559240f0aff217d71dd3ec951b10 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Fri, 23 Jul 2021 09:38:32 +0000
Subject: [PATCH] Accepting request 907910 from
 home:avicenzi:branches:devel:kubic

Update flannel to 0.14.0

OBS-URL: https://build.opensuse.org/request/show/907910
OBS-URL: https://build.opensuse.org/package/show/devel:kubic/flannel?expand=0&rev=15
---
 flannel.changes   | 23 +++++++++++++++++++++++
 flannel.spec      |  8 ++++----
 kube-flannel.yaml |  8 ++++----
 v0.13.0.tar.gz    |  3 ---
 v0.14.0.tar.gz    |  3 +++
 5 files changed, 34 insertions(+), 11 deletions(-)
 delete mode 100644 v0.13.0.tar.gz
 create mode 100644 v0.14.0.tar.gz

diff --git a/flannel.changes b/flannel.changes
index 02a39d1..e7ec692 100644
--- a/flannel.changes
+++ b/flannel.changes
@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Fri Jul 23 08:54:45 UTC 2021 - Alexandre Vicenzi <alexandre.vicenzi@suse.com>
+
+- Update to 0.14.0:
+  * Add tencent cloud VPC network support
+  * moving go modules to flannel-io/flannel and updating to go 1.16
+  * fix(windows): nil pointer panic
+  * Preserve environment for extension backend
+  * Fix flannel hang if lease expired
+  * Documentation for the Flannel upgrade/downgrade procedure
+  * Move from glog to klog
+  * fix(host-gw): failed to restart if gateway hnsep existed
+  * ipsec: use well known paths of charon daemon
+  * upgrade client-go to 1.19.4
+  * move from juju/errors to pkg/errors
+  * subnets: move forward the cursor to skip illegal subnet
+  * Fix Expired URL to Deploying Flannel with kubeadm
+  * Modify kube-flannel.yaml to use rbac.authorization.k8s.io/v1
+  * preserve AccessKey & AccessKeySecret environment on sudo fix some typo in doc.
+  * iptables: handle errors that prevent rule deletes
+- Sync kube-flannel.yaml manifest
+- Change project URL to github.com/flannel-io/flannel
+
 -------------------------------------------------------------------
 Wed Apr 28 13:20:33 UTC 2021 - Ralf Haferkamp <ralf@h4kamp.de>
 
diff --git a/flannel.spec b/flannel.spec
index 655c67d..f615e20 100644
--- a/flannel.spec
+++ b/flannel.spec
@@ -24,13 +24,13 @@
 %define flannel_container_path registry.opensuse.org/kubic/flannel
 
 Name:           flannel
-Version:        0.13.0
+Version:        0.14.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:         https://github.com/coreos/flannel/archive/v%{version}.tar.gz
+Url:            https://github.com/flannel-io/flannel
+Source:         https://github.com/flannel-io/flannel/archive/v%{version}.tar.gz
 Source1:        kube-flannel.yaml
 Requires:       iproute2
 # arp is used:
@@ -74,7 +74,7 @@ reduces the complexity of doing port mapping.
 
 %build
 gofmt -w -r "x -> \"%{version}\"" version/version.go
-%{goprep} github.com/coreos/flannel
+%{goprep} github.com/flannel-io/flannel
 # go1.16+ default is GO111MODULE=on set to auto temporarily
 # until using an upstream version with go.mod
 export GO111MODULE=auto
diff --git a/kube-flannel.yaml b/kube-flannel.yaml
index e561b1e..0feba26 100644
--- a/kube-flannel.yaml
+++ b/kube-flannel.yaml
@@ -47,7 +47,7 @@ spec:
     rule: 'RunAsAny'
 ---
 kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: flannel
 rules:
@@ -76,7 +76,7 @@ rules:
   - patch
 ---
 kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: flannel
 roleRef:
@@ -166,7 +166,7 @@ spec:
       serviceAccountName: flannel
       initContainers:
       - name: install-cni
-        image: quay.io/coreos/flannel:v0.13.0
+        image: quay.io/coreos/flannel:v0.14.0
         command:
         - cp
         args:
@@ -180,7 +180,7 @@ spec:
           mountPath: /etc/kube-flannel/
       containers:
       - name: kube-flannel
-        image: quay.io/coreos/flannel:v0.13.0
+        image: quay.io/coreos/flannel:v0.14.0
         command:
         - /opt/bin/flanneld
         args:
diff --git a/v0.13.0.tar.gz b/v0.13.0.tar.gz
deleted file mode 100644
index 9cae207..0000000
--- a/v0.13.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ee519c58d1d1f3cc8e3ab2e21a6e30a024de16927961fe678a5453e70c16f557
-size 7229344
diff --git a/v0.14.0.tar.gz b/v0.14.0.tar.gz
new file mode 100644
index 0000000..75e03b5
--- /dev/null
+++ b/v0.14.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e17164db3b158d13ce5e40bb7b233790cb186762d929fa4f626baf586d4d63ca
+size 8324790