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
This commit is contained in:
parent
95dbd2dabc
commit
2695630455
20
_service
Normal file
20
_service
Normal file
@ -0,0 +1,20 @@
|
||||
<services>
|
||||
<service name="obs_scm" mode="disabled">
|
||||
<param name="url">https://github.com/flannel-io/flannel.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="exclude">.git</param>
|
||||
<param name="versionformat">@PARENT_TAG@</param>
|
||||
<param name="versionrewrite-pattern">v(.*)</param>
|
||||
<param name="revision">v0.24.2</param>
|
||||
<param name="changesgenerate">enable</param>
|
||||
</service>
|
||||
<service name="tar" mode="disabled"/>
|
||||
<service name="recompress" mode="disabled">
|
||||
<param name="file">*.tar</param>
|
||||
<param name="compression">gz</param>
|
||||
</service>
|
||||
<service name="set_version" mode="disabled">
|
||||
<param name="basename">flannel</param>
|
||||
</service>
|
||||
</services>
|
||||
|
4
_servicedata
Normal file
4
_servicedata
Normal file
@ -0,0 +1,4 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">https://github.com/flannel-io/flannel.git</param>
|
||||
<param name="changesrevision">3d56ed16e123a6fb06841ba920664b3ce4c99cda</param></service></servicedata>
|
3
flannel-0.24.2.tar.gz
Normal file
3
flannel-0.24.2.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:320baa7e3a40c87cc1a000c33d2a2db52664ece2f6f676f6cedc91dfaad8105b
|
||||
size 2387361
|
@ -1,3 +1,36 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 31 13:05:53 UTC 2024 - Priyanka Saggu <priyanka.saggu@suse.com>
|
||||
|
||||
- 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 <alexandre.vicenzi@suse.com>
|
||||
|
||||
|
4
flannel.obsinfo
Normal file
4
flannel.obsinfo
Normal file
@ -0,0 +1,4 @@
|
||||
name: flannel
|
||||
version: 0.24.2
|
||||
mtime: 1705661246
|
||||
commit: 3d56ed16e123a6fb06841ba920664b3ce4c99cda
|
35
flannel.spec
35
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
|
||||
|
||||
|
BIN
v0.14.0.tar.gz
(Stored with Git LFS)
BIN
v0.14.0.tar.gz
(Stored with Git LFS)
Binary file not shown.
3
vendor.tar.gz
Normal file
3
vendor.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c4473ab0014138f1aa5a51ae05cb2dbf9e0a9ea7d0c2e581bd5b66de3b42da2e
|
||||
size 8785627
|
Loading…
Reference in New Issue
Block a user