diff --git a/_service b/_service index 19fff0d..4cee5be 100644 --- a/_service +++ b/_service @@ -2,7 +2,8 @@ https://github.com/traefik/traefik.git git - v2.4.12 + .git + v2.6.0 @PARENT_TAG@ enable v(.*) @@ -13,4 +14,6 @@ *.tar gz + + diff --git a/_servicedata b/_servicedata index 0bcd10d..4b39850 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/traefik/traefik.git - 8be434aaadfcb14270657980f7ffffa0ebca420b \ No newline at end of file + 5a1c936ede0c4ef1d7adb82052f8240f64791aa6 \ No newline at end of file diff --git a/fetch-webui.sh b/fetch-webui.sh new file mode 100644 index 0000000..3271dd5 --- /dev/null +++ b/fetch-webui.sh @@ -0,0 +1,13 @@ +version=$(grep -oP "(?<=v).*(?=<\/param>)" _service) + +echo "Fetching Traefik WebUI $version" + +wget https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz + +tar -xvf traefik-v${version}.src.tar.gz ./webui/static + +tar -czvf traefik-${version}.webui.tar.gz webui + +rm -rf webui + +echo "Done" diff --git a/traefik-2.4.12.tar.gz b/traefik-2.4.12.tar.gz deleted file mode 100644 index 9b93c08..0000000 --- a/traefik-2.4.12.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:16412ce3f935e18e51837bfba026728d6f21ea8feb8e617955ce04a29a446da2 -size 8482253 diff --git a/traefik-2.6.0.tar.gz b/traefik-2.6.0.tar.gz new file mode 100644 index 0000000..31d5232 --- /dev/null +++ b/traefik-2.6.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da5a47550b6484c8f70c6dbe8a2227687d235974f4c9b989e7e1fc838e21d085 +size 8652293 diff --git a/traefik-2.6.0.webui.tar.gz b/traefik-2.6.0.webui.tar.gz new file mode 100644 index 0000000..0cf4851 --- /dev/null +++ b/traefik-2.6.0.webui.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b7373ec636763409069b45703d4e960ce311bd3b5912891476ab7dc6d8c710b +size 1892068 diff --git a/traefik.changes b/traefik.changes index a93ca9b..1a5cd96 100644 --- a/traefik.changes +++ b/traefik.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Fri Feb 04 13:37:58 UTC 2022 - alexandre.vicenzi@suse.com + +- Update to version 2.6.0: + * Updated Kubernetes Gateway API provider + * Consul Enterprise support + * Consul Connect support + * Inflight request middleware for TCP routers + * HTTP/3 support (experimental) + * Added support for loading plugins directly from the filesystem (Local Plugins) + * Added ability to create Provider Plugins + * Added TCP Middleware + * Kubernetes 1.22 API changes + * Dropped support for Ingress API versions extensions/v1beta1 + * Updated Traefik Proxy CRDs to use API apiextensions.k8s.io/v1 + ------------------------------------------------------------------- Wed Jul 28 15:46:39 UTC 2021 - alexandre.vicenzi@suse.com @@ -26,7 +42,6 @@ Wed Jul 28 15:46:39 UTC 2021 - alexandre.vicenzi@suse.com * Use a dynamic buffer to handle client Hello SNI detection * Error span on 5xx only - ------------------------------------------------------------------- Wed May 19 09:06:54 UTC 2021 - Bernhard Wiedemann diff --git a/traefik.spec b/traefik.spec index 855f7f1..9ed1099 100644 --- a/traefik.spec +++ b/traefik.spec @@ -1,7 +1,7 @@ # # spec file for package traefik # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define project github.com/traefik/traefik Name: traefik -Version: 2.4.12 +Version: 2.6.0 Release: 0 Summary: The Cloud Native Application Proxy License: MIT @@ -29,6 +29,7 @@ Source0: %{name}-%{version}.tar.gz Source1: vendor.tar.gz Source2: traefik.service Source3: traefik.toml +Source4: %{name}-%{version}.webui.tar.gz BuildRequires: go-bindata BuildRequires: golang-packaging BuildRequires: systemd-rpm-macros @@ -57,6 +58,9 @@ build_date=$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +"%%Y%%m%%d") # tarball causes "inconsistent vendoring" tar -xf %{SOURCE1} +# unpack webui +tar -xf %{SOURCE4} + CGO_ENABLED=0 go generate diff --git a/vendor.tar.gz b/vendor.tar.gz index e08894b..92f3f50 100644 --- a/vendor.tar.gz +++ b/vendor.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:74eadde544912098484507de8c928f741220e5e4f2a2aea6bbfe1201b1125130 -size 11921724 +oid sha256:81ecb1ce6078e5916b232545a806815ed9a9b7d8b960a77b92cbc8b7e409ef82 +size 15460792