Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

listen on ipv4 and ipv6 localhost addrs for admin server #4663

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

listen on ipv4 and ipv6 localhost addrs for admin server #4663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e3ba7f
listen on ipv4 and ipv6 localhost addrs for admin server
arkodg Nov 7, 2024
9f3356f
fix shutdown mgr localhost addr
arkodg Nov 8, 2024
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
10 changes: 6 additions & 4 deletions internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ envoyProxyForGatewayClass:
path: /dev/null
address:
socket_address:
address: 127.0.0.1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

plan to use this as the default value even for IPv4 cluster?

address: ::1
port_value: 19000
ipv4_compat: true
Comment on lines +18 to +20
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

won't work on 127.0.0.1

layered_runtime:
layers:
- name: global_config
Expand Down Expand Up @@ -87,7 +88,7 @@ envoyProxyForGatewayClass:
- endpoint:
address:
socket_address:
address: 127.0.0.1
address: ::1
port_value: 19000
- connect_timeout: 10s
load_assignment:
Expand Down Expand Up @@ -532,7 +533,8 @@ xds:
path: /dev/null
address:
socketAddress:
address: 127.0.0.1
address: ::1
ipv4Compat: true
portValue: 19000
dynamicResources:
adsConfig:
Expand Down Expand Up @@ -572,7 +574,7 @@ xds:
- endpoint:
address:
socketAddress:
address: 127.0.0.1
address: ::1
portValue: 19000
name: prometheus_stats
type: STATIC
Expand Down
5 changes: 3 additions & 2 deletions internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
],
"address": {
"socketAddress": {
"address": "127.0.0.1",
"address": "::1",
"ipv4Compat": true,
"portValue": 19000
}
}
Expand Down Expand Up @@ -81,7 +82,7 @@
"endpoint": {
"address": {
"socketAddress": {
"address": "127.0.0.1",
"address": "::1",
"portValue": 19000
}
}
Expand Down
5 changes: 3 additions & 2 deletions internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ xds:
path: /dev/null
address:
socketAddress:
address: 127.0.0.1
address: ::1
ipv4Compat: true
portValue: 19000
dynamicResources:
adsConfig:
Expand Down Expand Up @@ -51,7 +52,7 @@ xds:
- endpoint:
address:
socketAddress:
address: 127.0.0.1
address: ::1
portValue: 19000
name: prometheus_stats
type: STATIC
Expand Down
5 changes: 3 additions & 2 deletions internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.bootstrap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ xds:
path: /dev/null
address:
socketAddress:
address: 127.0.0.1
address: ::1
ipv4Compat: true
portValue: 19000
dynamicResources:
adsConfig:
Expand Down Expand Up @@ -50,7 +51,7 @@ xds:
- endpoint:
address:
socketAddress:
address: 127.0.0.1
address: ::1
portValue: 19000
name: prometheus_stats
type: STATIC
Expand Down
5 changes: 3 additions & 2 deletions internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
],
"address": {
"socketAddress": {
"address": "127.0.0.1",
"address": "::1",
"ipv4Compat": true,
"portValue": 19000
}
}
Expand Down Expand Up @@ -81,7 +82,7 @@
"endpoint": {
"address": {
"socketAddress": {
"address": "127.0.0.1",
"address": "::1",
"portValue": 19000
}
}
Expand Down
5 changes: 3 additions & 2 deletions internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ xds:
path: /dev/null
address:
socketAddress:
address: 127.0.0.1
address: ::1
ipv4Compat: true
portValue: 19000
dynamicResources:
adsConfig:
Expand Down Expand Up @@ -51,7 +52,7 @@ xds:
- endpoint:
address:
socketAddress:
address: 127.0.0.1
address: ::1
portValue: 19000
name: prometheus_stats
type: STATIC
Expand Down
5 changes: 3 additions & 2 deletions ...rnal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.bootstrap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ xds:
path: /dev/null
address:
socketAddress:
address: 127.0.0.1
address: ::1
ipv4Compat: true
portValue: 19000
dynamicResources:
adsConfig:
Expand Down Expand Up @@ -50,7 +51,7 @@ xds:
- endpoint:
address:
socketAddress:
address: 127.0.0.1
address: ::1
portValue: 19000
name: prometheus_stats
type: STATIC
Expand Down
5 changes: 3 additions & 2 deletions internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ xds:
path: /dev/null
address:
socketAddress:
address: 127.0.0.1
address: ::1
ipv4Compat: true
portValue: 19000
dynamicResources:
adsConfig:
Expand Down Expand Up @@ -51,7 +52,7 @@ xds:
- endpoint:
address:
socketAddress:
address: 127.0.0.1
address: ::1
portValue: 19000
name: prometheus_stats
type: STATIC
Expand Down
4 changes: 2 additions & 2 deletions internal/cmd/envoy/shutdown_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
// postEnvoyAdminAPI sends a POST request to the Envoy admin API
func postEnvoyAdminAPI(path string) error {
if resp, err := http.Post(fmt.Sprintf("http://%s:%d/%s",
bootstrap.EnvoyAdminAddress, bootstrap.EnvoyAdminPort, path), "application/json", nil); err != nil {
"localhost", bootstrap.EnvoyAdminPort, path), "application/json", nil); err != nil {

Check warning on line 174 in internal/cmd/envoy/shutdown_manager.go

View check run for this annotation

Codecov / codecov/patch

internal/cmd/envoy/shutdown_manager.go#L174 

Added line #L174 was not covered by tests
return err
} else {
defer resp.Body.Close()
Expand All @@ -187,7 +187,7 @@
func getTotalConnections() (*int, error) {
// Send request to Envoy admin API to retrieve server.total_connections stat
if resp, err := http.Get(fmt.Sprintf("http://%s:%d//stats?filter=^server\\.total_connections$&format=json",
bootstrap.EnvoyAdminAddress, bootstrap.EnvoyAdminPort)); err != nil {
"localhost", bootstrap.EnvoyAdminPort)); err != nil {

Check warning on line 190 in internal/cmd/envoy/shutdown_manager.go

View check run for this annotation

Codecov / codecov/patch

internal/cmd/envoy/shutdown_manager.go#L190 

Added line #L190 was not covered by tests
return nil, err
} else {
defer resp.Body.Close()
Expand Down
5 changes: 3 additions & 2 deletions internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,9 @@ spec:
path: /dev/null
address:
socket_address:
address: 127.0.0.1
address: ::1
port_value: 19000
ipv4_compat: true
layered_runtime:
layers:
- name: global_config
Expand Down Expand Up @@ -119,7 +120,7 @@ spec:
- endpoint:
address:
socket_address:
address: 127.0.0.1
address: ::1
port_value: 19000
- connect_timeout: 10s
load_assignment:
Expand Down
5 changes: 3 additions & 2 deletions internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@ spec:
path: /dev/null
address:
socket_address:
address: 127.0.0.1
address: ::1
port_value: 19000
ipv4_compat: true
layered_runtime:
layers:
- name: global_config
Expand Down Expand Up @@ -118,7 +119,7 @@ spec:
- endpoint:
address:
socket_address:
address: 127.0.0.1
address: ::1
port_value: 19000
- connect_timeout: 10s
load_assignment:
Expand Down
5 changes: 3 additions & 2 deletions internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@ spec:
path: /dev/null
address:
socket_address:
address: 127.0.0.1
address: ::1
port_value: 19000
ipv4_compat: true
layered_runtime:
layers:
- name: global_config
Expand Down Expand Up @@ -118,7 +119,7 @@ spec:
- endpoint:
address:
socket_address:
address: 127.0.0.1
address: ::1
port_value: 19000
- connect_timeout: 10s
load_assignment:
Expand Down
3 changes: 2 additions & 1 deletion internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,9 @@ spec:
path: /dev/null
address:
socket_address:
address: 127.0.0.1
address: ::1
port_value: 19000
ipv4_compat: true
layered_runtime:
layers:
- name: global_config
Expand Down
5 changes: 3 additions & 2 deletions internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@ spec:
path: /dev/null
address:
socket_address:
address: 127.0.0.1
address: ::1
port_value: 19000
ipv4_compat: true
layered_runtime:
layers:
- name: global_config
Expand Down Expand Up @@ -118,7 +119,7 @@ spec:
- endpoint:
address:
socket_address:
address: 127.0.0.1
address: ::1
port_value: 19000
- connect_timeout: 10s
load_assignment:
Expand Down
5 changes: 3 additions & 2 deletions .../infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,9 @@ spec:
path: /dev/null
address:
socket_address:
address: 127.0.0.1
address: ::1
port_value: 19000
ipv4_compat: true
layered_runtime:
layers:
- name: global_config
Expand Down Expand Up @@ -127,7 +128,7 @@ spec:
- endpoint:
address:
socket_address:
address: 127.0.0.1
address: ::1
port_value: 19000
- connect_timeout: 10s
load_assignment:
Expand Down
5 changes: 3 additions & 2 deletions internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@ spec:
path: /dev/null
address:
socket_address:
address: 127.0.0.1
address: ::1
port_value: 19000
ipv4_compat: true
layered_runtime:
layers:
- name: global_config
Expand Down Expand Up @@ -118,7 +119,7 @@ spec:
- endpoint:
address:
socket_address:
address: 127.0.0.1
address: ::1
port_value: 19000
- connect_timeout: 10s
load_assignment:
Expand Down
5 changes: 3 additions & 2 deletions internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@ spec:
path: /dev/null
address:
socket_address:
address: 127.0.0.1
address: ::1
port_value: 19000
ipv4_compat: true
layered_runtime:
layers:
- name: global_config
Expand Down Expand Up @@ -118,7 +119,7 @@ spec:
- endpoint:
address:
socket_address:
address: 127.0.0.1
address: ::1
port_value: 19000
- connect_timeout: 10s
load_assignment:
Expand Down
5 changes: 3 additions & 2 deletions internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@ spec:
path: /dev/null
address:
socket_address:
address: 127.0.0.1
address: ::1
port_value: 19000
ipv4_compat: true
layered_runtime:
layers:
- name: global_config
Expand Down Expand Up @@ -118,7 +119,7 @@ spec:
- endpoint:
address:
socket_address:
address: 127.0.0.1
address: ::1
port_value: 19000
- connect_timeout: 10s
load_assignment:
Expand Down
5 changes: 3 additions & 2 deletions internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,9 @@ spec:
path: /dev/null
address:
socket_address:
address: 127.0.0.1
address: ::1
port_value: 19000
ipv4_compat: true
layered_runtime:
layers:
- name: global_config
Expand Down Expand Up @@ -123,7 +124,7 @@ spec:
- endpoint:
address:
socket_address:
address: 127.0.0.1
address: ::1
port_value: 19000
- connect_timeout: 10s
load_assignment:
Expand Down
Loading
Loading