Skip to content

Commit 523f991

Browse files
committed
Revert "fix(memberlist): Respect interface names config for advertise address (#13940)"
This reverts commit 751324c.
1 parent a0a0914 commit 523f991

File tree

1 file changed

+0
-18
lines changed

1 file changed

+0
-18
lines changed

‎pkg/loki/modules.go‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
"github.com/grafana/dskit/kv/codec"
2424
"github.com/grafana/dskit/kv/memberlist"
2525
"github.com/grafana/dskit/middleware"
26-
"github.com/grafana/dskit/netutil"
2726
"github.com/grafana/dskit/ring"
2827
"github.com/grafana/dskit/runtimeconfig"
2928
"github.com/grafana/dskit/server"
@@ -1387,15 +1386,6 @@ func (t *Loki) initMemberlistKV() (services.Service, error) {
13871386
)
13881387
dnsProvider := dns.NewProvider(util_log.Logger, dnsProviderReg, dns.GolangResolverType)
13891388

1390-
var err error
1391-
t.Cfg.MemberlistKV.AdvertiseAddr, err = GetInstanceAddr(
1392-
t.Cfg.MemberlistKV.AdvertiseAddr,
1393-
t.Cfg.Common.InstanceInterfaceNames,
1394-
util_log.Logger,
1395-
)
1396-
if err != nil {
1397-
return nil, err
1398-
}
13991389
t.MemberlistKV = memberlist.NewKVInitService(&t.Cfg.MemberlistKV, util_log.Logger, dnsProvider, reg)
14001390

14011391
t.Cfg.CompactorConfig.CompactorRing.KVStore.MemberlistKV = t.MemberlistKV.GetMemberlistKV
@@ -2028,11 +2018,3 @@ func schemaHasBoltDBShipperConfig(scfg config.SchemaConfig) bool {
20282018

20292019
return false
20302020
}
2031-
2032-
func GetInstanceAddr(addr string, netInterfaces []string, logger log.Logger) (string, error) {
2033-
if addr != "" {
2034-
return addr, nil
2035-
}
2036-
2037-
return netutil.GetFirstAddressOf(netInterfaces, logger, false)
2038-
}

0 commit comments

Comments
 (0)