From e88ab1942d0cea53b3d108527378fb4680c3a7cc1c79e0eabd3546ee45a6d10f Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Mon, 3 May 2021 12:11:33 +0000 Subject: [PATCH] Accepting request 889333 from home:avicenzi Move and Update Traefik v1.7 OBS-URL: https://build.opensuse.org/request/show/889333 OBS-URL: https://build.opensuse.org/package/show/devel:kubic/traefik1.7?expand=0&rev=1 --- .gitattributes | 23 +++++++ .gitignore | 1 + _service | 16 +++++ _servicedata | 4 ++ traefik-1.7.30.tar.gz | 3 + traefik.changes | 23 +++++++ traefik.service | 19 ++++++ traefik.spec | 104 ++++++++++++++++++++++++++++ traefik.toml | 154 ++++++++++++++++++++++++++++++++++++++++++ vendor.tar.gz | 3 + 10 files changed, 350 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 _service create mode 100644 _servicedata create mode 100644 traefik-1.7.30.tar.gz create mode 100644 traefik.changes create mode 100644 traefik.service create mode 100644 traefik.spec create mode 100644 traefik.toml create mode 100644 vendor.tar.gz diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/_service b/_service new file mode 100644 index 0000000..be5adce --- /dev/null +++ b/_service @@ -0,0 +1,16 @@ + + + https://github.com/traefik/traefik.git + git + v1.7.30 + @PARENT_TAG@ + enable + v(.*) + + + + + *.tar + gz + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..ce0c525 --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://github.com/traefik/traefik.git + a0d8ee5a0252205e378a9a80d7ddc54483a5f03c \ No newline at end of file diff --git a/traefik-1.7.30.tar.gz b/traefik-1.7.30.tar.gz new file mode 100644 index 0000000..a834691 --- /dev/null +++ b/traefik-1.7.30.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a45226272a4871ecf4384333e5d89baf409bf5954bc932e623071cc207174e58 +size 3489242 diff --git a/traefik.changes b/traefik.changes new file mode 100644 index 0000000..7dc0a5b --- /dev/null +++ b/traefik.changes @@ -0,0 +1,23 @@ +------------------------------------------------------------------- +Thu Apr 29 14:22:24 UTC 2021 - alexandre.vicenzi@suse.com + +- Update to version 1.7.30: + * Prepare release v1.7.30 + * prometheus: fixing prom Handler to use the custom registry + * Prepare release v1.7.29 + * Update to go1.16 + * Prepare release v1.7.28 + * chore: Do a Docker login on Travis CI. + * fix: encrypted key in Travis CI. + * Prepare release v1.7.27 + * Update copyright year for 2021 + * Fix tlsclientheaders integration test + +------------------------------------------------------------------- +Thu Jan 10 14:50:22 UTC 2019 - pgeorgiadis@suse.com + +- Initial package release to version 1.7.7: + * Check for watched namespace before getting kubernetes objects + * Allow empty path with App-root annotation + * kubernetes: sort and uniq TLS secrets + * Skip TLS section with no secret in Kubernetes ingress diff --git a/traefik.service b/traefik.service new file mode 100644 index 0000000..95228dd --- /dev/null +++ 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 diff --git a/traefik.spec b/traefik.spec new file mode 100644 index 0000000..13ab097 --- /dev/null +++ b/traefik.spec @@ -0,0 +1,104 @@ +# +# spec file for package traefik +# +# 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + +%define project github.com/traefik/traefik +%define build_date %(date +"%Y%m%d") + +Name: traefik +Version: 1.7.30 +Release: 0 +Summary: The Cloud Native Application Proxy +License: MIT +Group: Productivity/Networking/Web/Proxy +URL: https://traefik.io/ +Source0: %{name}-%{version}.tar.gz +Source1: vendor.tar.gz +Source2: traefik.service +Source3: traefik.toml +BuildRequires: go-bindata +BuildRequires: golang(API) >= 1.16 +BuildRequires: golang-packaging +BuildRequires: systemd-rpm-macros +Recommends: podman +%{?systemd_requires} +%{go_provides} +# Make sure that the binary is not getting stripped. +%{go_nostrip} + +%description +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. + +Pointing Traefik at your orchestrator should be the only configuration step you need. + +%prep +%setup -q + +%build +%{goprep} %{project} + +# tarball causes "inconsistent vendoring" +tar -xf %{SOURCE1} + +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 +install -d %{buildroot}/%{_sbindir} +install -D -p -m 0755 %{name} %{buildroot}%{_bindir}/%{name} + +# service +install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service +ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{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 +%{_bindir}/%{name} + +%{_unitdir}/%{name}.service +%{_sbindir}/rc%{name} + +%dir %{_sysconfdir}/%{name} +%config(noreplace) %{_sysconfdir}/%{name}/%{name}.toml + +%changelog diff --git a/traefik.toml b/traefik.toml new file mode 100644 index 0000000..a2d01a1 --- /dev/null +++ b/traefik.toml @@ -0,0 +1,154 @@ +################################################################ +# Global configuration +################################################################ + +# Enable debug mode +# +# Optional +# Default: false +# +# debug = true + +# Log level +# +# Optional +# Default: "ERROR" +# +logLevel = "INFO" + +# Entrypoints to be used by frontends that do not specify any entrypoint. +# Each frontend can specify its own entrypoints. +# +# Optional +# Default: ["http"] +# +# defaultEntryPoints = ["http", "https"] + +################################################################ +# Entrypoints configuration +################################################################ + +# Entrypoints definition +# +# Optional +# Default: +[entryPoints] + [entryPoints.http] + address = ":80" + +################################################################ +# Traefik logs configuration +################################################################ + +# Traefik logs +# Enabled by default and log to stdout +# +# Optional +# +[traefikLog] + +# 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 = "common" + +################################################################ +# 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 = "common" + +################################################################ +# API and dashboard configuration +################################################################ + +# Enable API and dashboard +[api] + + # Name of the related entry point + # + # Optional + # Default: "traefik" + # + # entryPoint = "traefik" + + # 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 +[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 domain used. +# Can be overridden by setting the "traefik.domain" label on a container. +# +# Optional +# Default: "" +# +# domain = "docker.localhost" + +# Expose containers by default in traefik +# +# Optional +# Default: true +# +# exposedByDefault = true diff --git a/vendor.tar.gz b/vendor.tar.gz new file mode 100644 index 0000000..97e80a9 --- /dev/null +++ b/vendor.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a53f6eb880009de6214f3de3121294c871554a2c40e96f2320acf66c72a23fe +size 10509825