From 269563045556499d7d38b58212691de6a06f96110410f67f8f9650c18793d01c Mon Sep 17 00:00:00 2001 From: Priyanka Saggu Date: Wed, 31 Jan 2024 13:27:43 +0000 Subject: [PATCH] Accepting request 1143026 from home:psaggu:branches:devel:kubic Update to version 0.24.2: - sync `kube-flannel.yaml` manifest with upstream release, v0.24.2 (bsc#1218694) - refactor, clean spec file. Include following change: * bump go version build requirements: `BuildRequires: golang(API) >= 1.20` * include go modules dependencies as vendor tar - vendor.tar.gz, update following %prep, %build, %install sections accordingly OBS-URL: https://build.opensuse.org/request/show/1143026 OBS-URL: https://build.opensuse.org/package/show/devel:kubic/flannel?expand=0&rev=16 --- _service | 20 ++++++++++++++++++++ _servicedata | 4 ++++ flannel-0.24.2.tar.gz | 3 +++ flannel.changes | 33 +++++++++++++++++++++++++++++++++ flannel.obsinfo | 4 ++++ flannel.spec | 35 +++++++++++++++-------------------- v0.14.0.tar.gz | 3 --- vendor.tar.gz | 3 +++ 8 files changed, 82 insertions(+), 23 deletions(-) create mode 100644 _service create mode 100644 _servicedata create mode 100644 flannel-0.24.2.tar.gz create mode 100644 flannel.obsinfo delete mode 100644 v0.14.0.tar.gz create mode 100644 vendor.tar.gz diff --git a/_service b/_service new file mode 100644 index 0000000..5a6fe5b --- /dev/null +++ b/_service @@ -0,0 +1,20 @@ + + + https://github.com/flannel-io/flannel.git + git + .git + @PARENT_TAG@ + v(.*) + v0.24.2 + enable + + + + *.tar + gz + + + flannel + + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..7f41696 --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://github.com/flannel-io/flannel.git + 3d56ed16e123a6fb06841ba920664b3ce4c99cda \ No newline at end of file diff --git a/flannel-0.24.2.tar.gz b/flannel-0.24.2.tar.gz new file mode 100644 index 0000000..8c4eecd --- /dev/null +++ b/flannel-0.24.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:320baa7e3a40c87cc1a000c33d2a2db52664ece2f6f676f6cedc91dfaad8105b +size 2387361 diff --git a/flannel.changes b/flannel.changes index e7ec692..a68102a 100644 --- a/flannel.changes +++ b/flannel.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Wed Jan 31 13:05:53 UTC 2024 - Priyanka Saggu + +- sync `kube-flannel.yaml` manifest with upstream release, v0.24.2 (bsc#1218694) +- refactor, clean spec file. Include following change: + * bump go version build requirements: `BuildRequires: golang(API) >= 1.20` + * include go modules dependencies as vendor tar - vendor.tar.gz, update following %prep, %build, %install sections accordingly + +------------------------------------------------------------------- +Wed Jan 31 07:20:42 UTC 2024 - priyanka.saggu@suse.com + +- Update to version 0.24.2: + * Prepare for v0.24.2 release + * Increase the time out for interface checking in windows + * Prepare for v0.24.1 release + * Provide support to select the interface in Windows + * Improve the log from powershell + * Wait all the jobs to finish before deploy the github-page + * remove remaining references to mips64le + * add multi-arch dockerfile + * add missing riscv64 in docker manifest create step + * prepare for v0.24.0 release + * Bump golang.org/x/crypto from 0.15.0 to 0.17.0 + * Add the VNI to the error message in Windows + * chart: add possibility for defining image pull secrets in daemonset + * Remove multiclustercidr logic from code + * Update opentelemetry dependencies + * Bump go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc + * Add riscv64 arch in GH actions + * vxlan vni should not be type uint16 + * Quote wireguard psk in helm chart + * add riscv64 support + ------------------------------------------------------------------- Fri Jul 23 08:54:45 UTC 2021 - Alexandre Vicenzi diff --git a/flannel.obsinfo b/flannel.obsinfo new file mode 100644 index 0000000..f473b76 --- /dev/null +++ b/flannel.obsinfo @@ -0,0 +1,4 @@ +name: flannel +version: 0.24.2 +mtime: 1705661246 +commit: 3d56ed16e123a6fb06841ba920664b3ce4c99cda diff --git a/flannel.spec b/flannel.spec index f615e20..19dd6dc 100644 --- a/flannel.spec +++ b/flannel.spec @@ -24,20 +24,21 @@ %define flannel_container_path registry.opensuse.org/kubic/flannel Name: flannel -Version: 0.14.0 +Version: 0.24.2 Release: 0 Summary: An etcd backed network fabric for containers License: Apache-2.0 Group: System/Management Url: https://github.com/flannel-io/flannel -Source: https://github.com/flannel-io/flannel/archive/v%{version}.tar.gz -Source1: kube-flannel.yaml +Source0: flannel-%{version}.tar.gz +Source1: vendor.tar.gz +Source2: kube-flannel.yaml Requires: iproute2 # arp is used: Requires: net-tools-deprecated Requires: iptables BuildRequires: golang-packaging -BuildRequires: golang(API) >= 1.16 +BuildRequires: golang(API) >= 1.20 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExcludeArch: s390 %{go_nostrip} @@ -70,34 +71,28 @@ unique, routable IP address inside the cluster. The advantage of this model is t reduces the complexity of doing port mapping. %prep -%setup -q +%setup -q -a1 -n flannel-%{version} %build -gofmt -w -r "x -> \"%{version}\"" version/version.go -%{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 -%{gobuild} +%define project github.com/flannel-io/flannel +CGO_ENABLED=1 go build -mod=vendor -v -buildmode=pie -o dist/flanneld \ + -ldflags '-s -w -X github.com/flannel-io/flannel/pkg/version.Version=v%{version}' %install -%{goinstall} rm -rf %{buildroot}/%{_libdir}/go/contrib +# move the binary +install -D -m 0755 dist/flanneld %{buildroot}%{_sbindir}/flanneld + # Install provided yaml file to download and run the flannel container mkdir -p %{buildroot}%{_datadir}/k8s-yaml/flannel -#install -m 0644 Documentation/kube-flannel.yml %{buildroot}%{_datadir}/k8s-yaml/flannel/kube-flannel.yaml -install -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/k8s-yaml/flannel/kube-flannel.yaml -sed -i -e 's|image: quay.io/coreos/flannel:.*|image: %{flannel_container_path}:%{version}|g' %{buildroot}%{_datadir}/k8s-yaml/flannel/kube-flannel.yaml +install -m 0644 Documentation/kube-flannel.yml %{buildroot}%{_datadir}/k8s-yaml/flannel/kube-flannel.yaml +sed -i -e 's|image: docker.io/flannel/flannel:.*|image: %{flannel_container_path}:%{version}|g' %{buildroot}%{_datadir}/k8s-yaml/flannel/kube-flannel.yaml sed -i -e 's|/opt/bin/flanneld|/usr/sbin/flanneld|g' %{buildroot}%{_datadir}/k8s-yaml/flannel/kube-flannel.yaml -# Move -mkdir -p %{buildroot}%{_sbindir} -mv %{buildroot}%{_bindir}/flannel %{buildroot}%{_sbindir}/flanneld - %files %defattr(-,root,root) -%doc README.md DCO NOTICE +%doc README.md DCO %license LICENSE %{_sbindir}/flanneld diff --git a/v0.14.0.tar.gz b/v0.14.0.tar.gz deleted file mode 100644 index 75e03b5..0000000 --- a/v0.14.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e17164db3b158d13ce5e40bb7b233790cb186762d929fa4f626baf586d4d63ca -size 8324790 diff --git a/vendor.tar.gz b/vendor.tar.gz new file mode 100644 index 0000000..7ef5b8e --- /dev/null +++ b/vendor.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4473ab0014138f1aa5a51ae05cb2dbf9e0a9ea7d0c2e581bd5b66de3b42da2e +size 8785627