Accepting request 889332 from home:avicenzi:branches:devel:kubic

Updata Traefik to 2.4.8 OBS-URL: https://build.opensuse.org/request/show/889332 OBS-URL: https://build.opensuse.org/package/show/devel:kubic/traefik?expand=0&rev=3
2021-05-03 12:11:44 +00:00 · 2021-05-03 12:11:44 +00:00 · e2a2cb27da
commit e2a2cb27da
parent f73febbfb2
10 changed files with 269 additions and 44 deletions
--- a/18
+++ b/18
@ -1,12 +1,16 @@
 <services>
-  <service name="download_url" mode="disabled">
-    <param name="protocol">https</param>
-    <param name="host">github.com</param>
-    <param name="path">/containous/traefik/releases/download/v1.7.7/traefik-v1.7.7.src.tar.gz</param>
-    <param name="filename">traefik-v1.7.7.tar.gz</param>
+  <service name="tar_scm" mode="disabled">
+    <param name="url">https://github.com/traefik/traefik.git</param>
+    <param name="scm">git</param>
+    <param name="revision">v2.4.8</param>
+    <param name="versionformat">@PARENT_TAG@</param>
+    <param name="changesgenerate">enable</param>
+    <param name="versionrewrite-pattern">v(.*)</param>
+  </service>
+  <service mode="disabled" name="set_version">
  </service>
  <service name="recompress" mode="disabled">
-    <param name="file">*.tar.gz</param>
-    <param name="compression">xz</param>
+    <param name="file">*.tar</param>
+    <param name="compression">gz</param>
  </service>
 </services>
--- a/4
+++ b/4
@ -0,0 +1,4 @@
+<servicedata>
+<service name="tar_scm">
+                <param name="url">https://github.com/traefik/traefik.git</param>
+              <param name="changesrevision">32655b5b16a1142b8b460e2d8dd68fe00d86a6bf</param></service></servicedata>
--- a/traefik-2.4.8.tar.gz
+++ b/traefik-2.4.8.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:56997e9fa356cac520646e0f004d5fc0f72bf773a4071aae79af9951e83a225f
+size 7481622
--- a/2
+++ b/2
@ -1,2 +0,0 @@
-addFilter (".* W: position-independent-executable-suggested /usr/bin/traefik")
-addFilter (".* W: statically-linked-binary /usr/bin/traefik")
--- a/traefik-v1.7.7.tar.xz
+++ b/traefik-v1.7.7.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e57bedfbcd49e8c3ed4cda2d46ff134cfe3de38bed244fd5cdb200c0e05dd64a
-size 7194192
--- a/traefik.changes
+++ b/traefik.changes
@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Thu Apr 29 10:07:36 UTC 2021 - alexandre.vicenzi@suse.com
+
+- Update to version 2.4.8:
+  * Prepare release v2.4.8
+  * Raise errors for non-ASCII domain names in a router's rules
+  * Adding an option to (de)activate Pilot integration into the Traefik dashboard
+  * Doc: improve basic auth middleware httpasswd example
+  * Add missing `traefik.` prefix across sample config
+  * Fix travis docker image pulling for docs
+  * updating docs to remove a no longer needed note
+  * Update to gateway-api v0.2.0
+  * server: updating go-proxyproto with security bugfix from upstream
+  * Update go-acme/lego to v4.3.1
+
 -------------------------------------------------------------------
 Thu Jan 10 14:50:22 UTC 2019 - pgeorgiadis@suse.com

--- a/traefik.service
+++ b/traefik.service
@ -0,0 +1,19 @@
+[Unit]
+Description=Traefik
+Documentation=https://doc.traefik.io/traefik/
+After=network.target network-online.target
+Requires=network-online.target
+AssertFileIsExecutable=/usr/bin/traefik
+AssertPathExists=/etc/traefik/traefik.toml
+
+[Service]
+Type=notify
+ExecStart=/usr/bin/traefik --configFile=/etc/traefik/traefik.toml
+Restart=always
+WatchdogSec=1s
+PrivateTmp=true
+ProtectSystem=full
+AmbientCapabilities=CAP_NET_BIND_SERVICE
+
+[Install]
+WantedBy=multi-user.target
--- a/traefik.spec
+++ b/traefik.spec
@ -1,7 +1,7 @@
 #
 # spec file for package traefik
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -15,58 +15,90 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #

-# Make sure that the binary is not getting stripped.
-%{go_nostrip}
+%define project github.com/traefik/traefik
+%define build_date %(date +"%Y%m%d")

 Name:           traefik
-Version:        1.7.7
+Version:        2.4.8
 Release:        0
-Summary:        The Cloud Native Edge Router
+Summary:        The Cloud Native Application Proxy
 License:        MIT
 Group:          Productivity/Networking/Web/Proxy
 URL:            https://traefik.io/
-Source0:        %{name}-v%{version}.tar.xz
+Source0:        %{name}-%{version}.tar.gz
+Source1:        vendor.tar.gz
+Source2:        traefik.service
+Source3:        traefik.toml
 BuildRequires:  go-bindata
-BuildRequires:  fdupes
-BuildRequires:  golang(API) >= 1.10
+BuildRequires:  golang(API) >= 1.16
 BuildRequires:  golang-packaging
-Requires(pre):  %fillup_prereq
+BuildRequires:  systemd-rpm-macros
+Recommends:     podman
+%{?systemd_requires}
+%{go_provides}
+# Make sure that the binary is not getting stripped.
+%{go_nostrip}

 %description
-Traefik listens to your service registry/orchestrator API and instantly
-generates the routes so your microservices are connected to the outside
-world -- without further intervention from your part.
+Traefik (pronounced traffic) is a modern HTTP reverse proxy and load balancer
+that makes deploying microservices easy. Traefik integrates with your existing
+infrastructure components (Docker, Swarm mode, Kubernetes, Marathon, Consul,
+Etcd, Rancher, Amazon ECS) and configures itself automatically and dynamically.

-Traefik is a modern HTTP reverse proxy and load balancer that makes
-deploying microservices easy. Traefik integrates with your existing
-infrastructure components (Docker, Swarm mode, Kubernetes, Marathon,
-Consul, Etcd, Rancher, Amazon ECS, ...) and configures itself
-automatically and dynamically.
-
-Pointing Traefik at your orchestrator should be the only configuration
-step you need.
-
-Documentation: http://docs.traefik.io/
+Pointing Traefik at your orchestrator should be the only configuration step you need.

 %prep
-%setup -q -c -n %{name}-v%{version}
+%setup -q

 %build
-%{goprep} github.com/containous/traefik
+%{goprep} %{project}

-# workaround: there is no %{gogenerate} macro
-cd %{_builddir}/go/src/github.com/containous/traefik;go generate
+# tarball causes "inconsistent vendoring"
+tar -xf %{SOURCE1}

-%{gobuild} ./cmd/traefik
+CGO_ENABLED=0
+
+go generate
+
+go build \
+  -buildmode=pie \
+  -mod=vendor \
+  -ldflags "-s -w -X github.com/traefik/traefik/v2/pkg/version.Version=%{version} -X github.com/traefik/traefik/v2/pkg/version.Codename='' -X github.com/traefik/traefik/v2/pkg/version.BuildDate=%{build_date}" \
+  -o traefik ./cmd/traefik/

 %install
-%{goinstall}
-%{gofilelist}
-%fdupes %{buildroot}/%{_prefix}
+install -d %{buildroot}/%{_sbindir}
+install -D -p -m 0755 %{name} %{buildroot}%{_bindir}/%{name}

-%files -f file.lst
+# service
+install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service
+ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}

-%{_bindir}/%{name}
+# configuration
+install -D -p -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}/%{name}.toml
+
+%pre
+%service_add_pre %{name}.service
+
+%post
+%service_add_post %{name}.service
+%{fillup_only -n %{name}}
+
+%preun
+%service_del_preun %{name}.service
+
+%postun
+%service_del_postun %{name}.service
+
+%files
 %license LICENSE.md
+%doc README.md SECURITY.md CONTRIBUTING.md
+%{_bindir}/%{name}
+
+%{_unitdir}/%{name}.service
+%{_sbindir}/rc%{name}
+
+%dir %{_sysconfdir}/%{name}
+%config(noreplace) %{_sysconfdir}/%{name}/%{name}.toml

 %changelog
--- a/traefik.toml
+++ b/traefik.toml
@ -0,0 +1,150 @@
+################################################################
+#
+# Configuration sample for Traefik v2.
+#
+################################################################
+
+################################################################
+# Global configuration
+################################################################
+[global]
+  checkNewVersion = true
+  sendAnonymousUsage = false
+
+################################################################
+# Entrypoints configuration
+################################################################
+
+# Entrypoints definition
+#
+# Optional
+# Default:
+[entryPoints]
+  [entryPoints.web]
+    address = ":80"
+
+  [entryPoints.websecure]
+    address = ":443"
+
+################################################################
+# Traefik logs configuration
+################################################################
+
+# Traefik logs
+# Enabled by default and log to stdout
+#
+# Optional
+#
+[log]
+
+  # Log level
+  #
+  # Optional
+  # Default: "ERROR"
+  #
+  level = "INFO"
+
+  # Sets the filepath for the traefik log. If not specified, stdout will be used.
+  # Intermediate directories are created if necessary.
+  #
+  # Optional
+  # Default: os.Stdout
+  #
+  # filePath = "log/traefik.log"
+
+  # Format is either "json" or "common".
+  #
+  # Optional
+  # Default: "common"
+  #
+  # format = "json"
+
+################################################################
+# Access logs configuration
+################################################################
+
+# Enable access logs
+# By default it will write to stdout and produce logs in the textual
+# Common Log Format (CLF), extended with additional fields.
+#
+# Optional
+#
+[accessLog]
+
+  # Sets the file path for the access log. If not specified, stdout will be used.
+  # Intermediate directories are created if necessary.
+  #
+  # Optional
+  # Default: os.Stdout
+  #
+  # filePath = "/path/to/log/log.txt"
+
+  # Format is either "json" or "common".
+  #
+  # Optional
+  # Default: "common"
+  #
+  # format = "json"
+
+################################################################
+# API and dashboard configuration
+################################################################
+
+# Enable API and dashboard
+[api]
+
+  # Enable the API in insecure mode
+  #
+  # Optional
+  # Default: false
+  #
+  # insecure = true
+
+  # Enabled Dashboard
+  #
+  # Optional
+  # Default: true
+  #
+  # dashboard = false
+
+################################################################
+# Ping configuration
+################################################################
+
+# Enable ping
+[ping]
+
+  # Name of the related entry point
+  #
+  # Optional
+  # Default: "traefik"
+  #
+  # entryPoint = "traefik"
+
+################################################################
+# Docker configuration backend
+################################################################
+
+# Enable Docker configuration backend
+[providers.docker]
+
+  # Docker server endpoint. Can be a tcp or a unix socket endpoint.
+  #
+  # Required
+  # Default: "unix:///var/run/docker.sock"
+  #
+  # endpoint = "tcp://10.10.10.10:2375"
+
+  # Default host rule.
+  #
+  # Optional
+  # Default: "Host(`{{ normalize .Name }}`)"
+  #
+  # defaultRule = "Host(`{{ normalize .Name }}.docker.localhost`)"
+
+  # Expose containers by default in traefik
+  #
+  # Optional
+  # Default: true
+  #
+  # exposedByDefault = false
--- a/vendor.tar.gz
+++ b/vendor.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:74eadde544912098484507de8c928f741220e5e4f2a2aea6bbfe1201b1125130
+size 11921724