Compare commits

...

24 Commits

Author SHA1 Message Date
f0b5e56e43 Added healthcheck params in consul tags 2024-07-17 18:27:21 +02:00
c644f42ea9 Fixed missing AUTH_HANDLER_URL env issue 2024-07-17 17:52:35 +02:00
941c5fdf92 Fixed missing AUTH_HANDLER_URL env issue 2024-07-17 17:48:24 +02:00
03de7082ab Try to fix consul middlewares 2024-07-17 17:15:39 +02:00
def22f26f1 Try to fix consul middlewares 2024-07-17 17:02:02 +02:00
fd37622ad6 Try to fix consul middlewares 2024-07-17 16:44:41 +02:00
96e08fce4c Try to fix consul middleware provider 2024-07-17 16:40:13 +02:00
0f8eda40ad Try to fix consul middleware provider 2024-07-17 16:32:26 +02:00
3285ee65da Try to fix consul middleware provider 2024-07-17 16:29:38 +02:00
47339bda36 Try to fix consul middleware provider 2024-07-17 16:26:31 +02:00
33269f9726 Try to fix consul middleware provider 2024-07-17 16:23:56 +02:00
5b5a8318a4 Fixed consul tags ordering 2024-07-17 16:20:02 +02:00
42b3a44364 Fixed consul tags ordering 2024-07-17 16:11:14 +02:00
20278f24b3 Fixed consul registered middlewares 2024-07-17 16:07:20 +02:00
ae49c9cdb8 Fixed consul registered middlewares 2024-07-17 16:03:46 +02:00
ea08da8d10 Fixed consul registered address 2024-07-17 15:34:55 +02:00
0aa6fc2aa3 Fixed consul registered tags 2024-07-17 15:22:30 +02:00
ab6189e855 Fixed consul registered address 2024-07-17 15:14:20 +02:00
1c244db6ea Fixed consul registered address 2024-07-17 15:09:37 +02:00
3394040a8c Fixed consul registered address 2024-07-17 15:07:09 +02:00
bc439fd4d2 revert consul router rules 2024-07-16 22:23:12 +02:00
16cfa5fead fix consul router rules 2024-07-16 22:17:51 +02:00
044c32e783 fix consul router rules 2024-07-16 21:53:59 +02:00
0d35173aab fix consul router rules 2024-07-16 21:47:58 +02:00
2 changed files with 13 additions and 12 deletions

View File

@@ -3,7 +3,6 @@ package config
import ( import (
"os" "os"
"github.com/gofiber/fiber/v2/log"
"github.com/joho/godotenv" "github.com/joho/godotenv"
) )
@@ -16,7 +15,7 @@ func init() {
func GetEnv(name string, defVal string) string { func GetEnv(name string, defVal string) string {
env := os.Getenv(name) env := os.Getenv(name)
if env == "" { if env == "" {
log.Panicf("Missing %s env variable", name) return defVal
} }
return env return env

View File

@@ -74,7 +74,7 @@ func (s *Service) Register() error {
ID: s.GetID(), ID: s.GetID(),
// Kind: consul.ServiceKindConnectProxy, // Kind: consul.ServiceKindConnectProxy,
Name: s.Name, Name: s.Name,
Address: s.domain, Address: s.Address,
Port: s.port, Port: s.port,
Tags: s.getTags(), Tags: s.getTags(),
// Connect: &consul.AgentServiceConnect{Native: true}, // Connect: &consul.AgentServiceConnect{Native: true},
@@ -178,22 +178,24 @@ func (s *Service) healthCheck() (bool, error) {
func (s *Service) getTags() []string { func (s *Service) getTags() []string {
tags := []string{ tags := []string{
"traefik.enable=true", "traefik.enable=true",
// "traefik.http.middlewares.auth_" + s.Name + ".forwardauth.trustForwardHeader=true",
// "traefik.http.middlewares.auth_" + s.Name + ".forwardauth.authRequestHeaders=Cookie",
// "traefik.http.middlewares.auth_" + s.Name + ".forwardauth.authResponseHeaders=Set-Cookie, Server",
"traefik.http.middlewares.auth_" + s.Name + ".plugin.auth.handlerURL=" + config.GetEnv("AUTH_HANDLER_URL", "http://identity.service.ego.io/api/v1/traefik"),
"traefik.http.middlewares.requestid_" + s.Name + ".plugin.requestid.headerName=X-Request-ID",
"traefik.http.middlewares.stripprefix_" + s.Name + ".stripprefix.prefixes=" + s.pathPrefix,
"traefik.http.routers." + s.Name + ".rule=PathPrefix(`" + s.pathPrefix + "`)", "traefik.http.routers." + s.Name + ".rule=PathPrefix(`" + s.pathPrefix + "`)",
// "traefik.http.routers." + s.Name + ".rule=Host(`" + s.domain + "`)", // "traefik.http.routers." + s.Name + ".rule=Host(`" + s.domain + "`)",
"traefik.http.routers." + s.Name + ".entryPoints=https", "traefik.http.routers." + s.Name + ".entryPoints=https",
// "traefik.http.routers." + s.Name + ".tls=true", // "traefik.http.routers." + s.Name + ".tls=true",
"traefik.http.routers." + s.Name + ".service=" + s.Name, "traefik.http.routers." + s.Name + ".service=" + s.Name,
"traefik.http.routers." + s.Name + ".middlewares=stripprefix_" + s.Name, // "traefik.http.routers." + s.Name + ".middlewares=auth_" + s.Name + ",stripprefix_" + s.Name,
// "traefik.http.routers." + s.Name + ".middlewares=auth_" + s.Name + ",requestid_" + s.Name + ",stripprefix_" + s.Name, "traefik.http.routers." + s.Name + ".middlewares=auth_" + s.Name + ",requestid_" + s.Name + ",stripprefix_" + s.Name + "",
"traefik.http.services." + s.Name + ".loadbalancer.server.scheme=http", "traefik.http.services." + s.Name + ".loadbalancer.server.scheme=http",
"traefik.http.services." + s.Name + ".loadbalancer.server.port=" + strconv.Itoa(s.port), "traefik.http.services." + s.Name + ".loadbalancer.server.port=" + strconv.Itoa(s.port),
"traefik.http.services." + s.Name + ".loadbalancer.passhostheader=false", "traefik.http.services." + s.Name + ".loadbalancer.passhostheader=true",
"traefik.http.middlewares.auth_" + s.Name + ".plugin.auth.handlerURL=" + config.GetEnv("AUTH_HANDLER_URL", ""), "traefik.http.services." + s.Name + ".loadbalancer.healthcheck.interval=1",
// "traefik.http.middlewares.auth_" + s.Name + ".forwardauth.authRequestHeaders=Cookie", "traefik.http.services." + s.Name + ".loadbalancer.healthcheck.timeout=1",
// "traefik.http.middlewares.auth_" + s.Name + ".forwardauth.authResponseHeaders=Set-Cookie, Server",
// "traefik.http.middlewares.auth_" + s.Name + ".forwardauth.trustForwardHeader=true",
// "traefik.http.middlewares.requestid_" + s.Name + ".plugin.requestid.headerName=X-Request-ID",
"traefik.http.middlewares.stripprefix_" + s.Name + ".stripprefix.prefixes=" + s.pathPrefix,
"traefik.tls.certificates.certfile=/certs/client.cert", "traefik.tls.certificates.certfile=/certs/client.cert",
"traefik.tls.certificates.keyfile=/certs/client.key", "traefik.tls.certificates.keyfile=/certs/client.key",
} }