3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-08-06 10:21:05 +02:00
Code Issues Projects Releases Packages Wiki Activity

envoyconfig: fix metrics ingress listener name (#2124)

Browse source
This commit is contained in:
Caleb Doxsey 2021-04-26 07:49:48 -06:00 • committed by GitHub
parent 9718d27ba6
commit 008bda99e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
config/envoyconfig/listeners.go
View file

@ -26,6 +26,7 @@ import (
"google.golang.org/protobuf/types/known/wrapperspb" "google.golang.org/protobuf/types/known/wrapperspb"
"github.com/pomerium/pomerium/config" "github.com/pomerium/pomerium/config"
"github.com/pomerium/pomerium/internal/hashutil"
"github.com/pomerium/pomerium/internal/log" "github.com/pomerium/pomerium/internal/log"
"github.com/pomerium/pomerium/internal/urlutil" "github.com/pomerium/pomerium/internal/urlutil"
"github.com/pomerium/pomerium/pkg/cryptutil" "github.com/pomerium/pomerium/pkg/cryptutil"
@ -238,8 +239,9 @@ func (b *Builder) buildMetricsListener(cfg *config.Config) (*envoy_config_listen
host = "" host = ""
} }
li := newEnvoyListener("metrics-ingress") addr := buildAddress(fmt.Sprintf("%s:%s", host, port), 9902)
li.Address = buildAddress(fmt.Sprintf("%s:%s", host, port), 9902) li := newEnvoyListener(fmt.Sprintf("metrics-ingress-%d", hashutil.MustHash(addr)))
li.Address = addr
li.FilterChains = []*envoy_config_listener_v3.FilterChain{filterChain} li.FilterChains = []*envoy_config_listener_v3.FilterChain{filterChain}
return li, nil return li, nil
} }

2
config/envoyconfig/listeners_test.go
View file

@ -35,7 +35,7 @@ func Test_buildMetricsHTTPConnectionManagerFilter(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
testutil.AssertProtoJSONEqual(t, ` testutil.AssertProtoJSONEqual(t, `
{ {
"name": "metrics-ingress", "name": "metrics-ingress-1566242852377945326",
"perConnectionBufferLimitBytes": 32768, "perConnectionBufferLimitBytes": 32768,
"address": { "address": {
"socketAddress": { "socketAddress": {

2
internal/controlplane/xdsmgr/xdsmgr.go
View file

@ -204,7 +204,7 @@ func (mgr *Manager) DeltaAggregatedResources(
return ctx.Err() return ctx.Err()
case outgoing <- res: case outgoing <- res:
log.Info(changeCtx). log.Info(changeCtx).
Str("nounce", res.Nonce). Str("nonce", res.Nonce).
Str("type", res.TypeUrl). Str("type", res.TypeUrl).
Msg("send update") Msg("send update")
} }