Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .changelog/1066.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
```release-note:bug
- envoy: use safe host:port construction for remaining admin API URLs to avoid malformed admin endpoint URLs with IPv6 addresses
10 changes: 8 additions & 2 deletions pkg/envoy/proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,10 @@
}

func (p *Proxy) dumpConfig() error {
envoyConfigDumpUrl := fmt.Sprintf("http://%s:%v/config_dump?include_eds", p.cfg.AdminAddr, p.cfg.AdminBindPort)
envoyConfigDumpUrl := fmt.Sprintf(
"http://%s/config_dump?include_eds",
net.JoinHostPort(p.cfg.AdminAddr, strconv.Itoa(p.cfg.AdminBindPort)),

Check failure on line 284 in pkg/envoy/proxy.go

View workflow job for this annotation

GitHub Actions / integration-tests

undefined: strconv

Check failure on line 284 in pkg/envoy/proxy.go

View workflow job for this annotation

GitHub Actions / integration-tests

undefined: net

Check failure on line 284 in pkg/envoy/proxy.go

View workflow job for this annotation

GitHub Actions / lint

undefined: strconv

Check failure on line 284 in pkg/envoy/proxy.go

View workflow job for this annotation

GitHub Actions / lint

undefined: net

Check failure on line 284 in pkg/envoy/proxy.go

View workflow job for this annotation

GitHub Actions / unit-tests

undefined: strconv

Check failure on line 284 in pkg/envoy/proxy.go

View workflow job for this annotation

GitHub Actions / unit-tests

undefined: net

Check failure on line 284 in pkg/envoy/proxy.go

View workflow job for this annotation

GitHub Actions / Go 1.25.8 darwin arm64 build

undefined: strconv

Check failure on line 284 in pkg/envoy/proxy.go

View workflow job for this annotation

GitHub Actions / Go 1.25.8 darwin arm64 build

undefined: net

Check failure on line 284 in pkg/envoy/proxy.go

View workflow job for this annotation

GitHub Actions / Go 1.25.8 linux arm build

undefined: strconv

Check failure on line 284 in pkg/envoy/proxy.go

View workflow job for this annotation

GitHub Actions / Go 1.25.8 linux arm build

undefined: net

Check failure on line 284 in pkg/envoy/proxy.go

View workflow job for this annotation

GitHub Actions / Go 1.25.8 linux arm64 build

undefined: strconv

Check failure on line 284 in pkg/envoy/proxy.go

View workflow job for this annotation

GitHub Actions / Go 1.25.8 linux arm64 build

undefined: net
)

rsp, err := p.client.Get(envoyConfigDumpUrl)
if err != nil {
Expand Down Expand Up @@ -390,7 +393,10 @@
return false, nil
case stateRunning, stateInitial:
// Query ready endpoint to check if proxy is Ready
envoyReadyURL := fmt.Sprintf("http://%s:%v/ready", p.cfg.AdminAddr, p.cfg.AdminBindPort)
envoyReadyURL := fmt.Sprintf(
"http://%s/ready",
net.JoinHostPort(p.cfg.AdminAddr, strconv.Itoa(p.cfg.AdminBindPort)),

Check failure on line 398 in pkg/envoy/proxy.go

View workflow job for this annotation

GitHub Actions / integration-tests

undefined: strconv

Check failure on line 398 in pkg/envoy/proxy.go

View workflow job for this annotation

GitHub Actions / integration-tests

undefined: net

Check failure on line 398 in pkg/envoy/proxy.go

View workflow job for this annotation

GitHub Actions / lint

undefined: strconv (typecheck)

Check failure on line 398 in pkg/envoy/proxy.go

View workflow job for this annotation

GitHub Actions / lint

undefined: net

Check failure on line 398 in pkg/envoy/proxy.go

View workflow job for this annotation

GitHub Actions / unit-tests

undefined: strconv

Check failure on line 398 in pkg/envoy/proxy.go

View workflow job for this annotation

GitHub Actions / unit-tests

undefined: net

Check failure on line 398 in pkg/envoy/proxy.go

View workflow job for this annotation

GitHub Actions / Go 1.25.8 darwin arm64 build

undefined: strconv

Check failure on line 398 in pkg/envoy/proxy.go

View workflow job for this annotation

GitHub Actions / Go 1.25.8 darwin arm64 build

undefined: net

Check failure on line 398 in pkg/envoy/proxy.go

View workflow job for this annotation

GitHub Actions / Go 1.25.8 linux arm build

undefined: strconv

Check failure on line 398 in pkg/envoy/proxy.go

View workflow job for this annotation

GitHub Actions / Go 1.25.8 linux arm build

undefined: net

Check failure on line 398 in pkg/envoy/proxy.go

View workflow job for this annotation

GitHub Actions / Go 1.25.8 linux arm64 build

undefined: strconv

Check failure on line 398 in pkg/envoy/proxy.go

View workflow job for this annotation

GitHub Actions / Go 1.25.8 linux arm64 build

undefined: net
)
rsp, err := p.client.Get(envoyReadyURL)
if err != nil {
p.cfg.Logger.Error("envoy: admin endpoint not available", "error", err)
Expand Down
Loading