3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-08-03 16:59:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

Revert "config: allow overriding port numbers using environment variables (#5194)" (#5273)

Browse source 
This reverts commit fdefcf9a16.

This was originally intended for a specific integration test use case,
but it did not end up being needed. Additionally, the environment
variable names can conflict with Kubernetes service environment variables.
This commit is contained in:
Joe Kralicky 2024-09-09 19:30:48 -04:00 • committed by GitHub
parent dad954ae16
commit 653d8f9594
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

37
config/config.go
View file

@ -8,7 +8,6 @@ import (
"fmt"
"net/http"
"net/url"
"os"
"github.com/pomerium/pomerium/internal/fileutil"
"github.com/pomerium/pomerium/internal/hashutil"
@ -129,36 +128,12 @@ func (cfg *Config) Checksum() uint64 {
// AllocatePorts populates
func (cfg *Config) AllocatePorts(ports [6]string) {
if port, ok := os.LookupEnv("POMERIUM_GRPC_PORT"); ok {
cfg.GRPCPort = port
} else {
cfg.GRPCPort = ports[0]
}
if port, ok := os.LookupEnv("POMERIUM_HTTP_PORT"); ok {
cfg.HTTPPort = port
} else {
cfg.HTTPPort = ports[1]
}
if port, ok := os.LookupEnv("POMERIUM_OUTBOUND_PORT"); ok {
cfg.OutboundPort = port
} else {
cfg.OutboundPort = ports[2]
}
if port, ok := os.LookupEnv("POMERIUM_METRICS_PORT"); ok {
cfg.MetricsPort = port
} else {
cfg.MetricsPort = ports[3]
}
if port, ok := os.LookupEnv("POMERIUM_DEBUG_PORT"); ok {
cfg.DebugPort = port
} else {
cfg.DebugPort = ports[4]
}
if port, ok := os.LookupEnv("POMERIUM_ACMETLSALPN_PORT"); ok {
cfg.ACMETLSALPNPort = port
} else {
cfg.ACMETLSALPNPort = ports[5]
}
cfg.GRPCPort = ports[0]
cfg.HTTPPort = ports[1]
cfg.OutboundPort = ports[2]
cfg.MetricsPort = ports[3]
cfg.DebugPort = ports[4]
cfg.ACMETLSALPNPort = ports[5]
}
// GetTLSClientConfig returns TLS configuration that accounts for additional CA entries