Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,7 @@
"connectTimeout": "10s",
"dnsLookupFamily": "V4_PREFERRED",
"dnsRefreshRate": "30s",
"ignoreHealthOnHostRemoval": true,
"lbPolicy": "LEAST_REQUEST",
"loadAssignment": {
"clusterName": "raw_githubusercontent_com_443",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ xds:
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: raw_githubusercontent_com_443
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ xds:
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: raw_githubusercontent_com_443
Expand Down
6 changes: 3 additions & 3 deletions internal/xds/translator/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,9 @@ func buildXdsCluster(args *xdsClusterArgs) (*buildClusterResult, error) {
CommonLbConfig: &clusterv3.Cluster_CommonLbConfig{},
PerConnectionBufferLimitBytes: buildBackandConnectionBufferLimitBytes(args.backendConnection),
Metadata: buildXdsMetadata(args.metadata),
// Dont wait for a health check to determine health and remove these endpoints
// if the endpoint has been removed via EDS by the control plane or removed from DNS query results
IgnoreHealthOnHostRemoval: true,
}

if args.statName != nil {
Expand Down Expand Up @@ -414,9 +417,6 @@ func buildXdsCluster(args *xdsClusterArgs) (*buildClusterResult, error) {
},
},
}
// Dont wait for a health check to determine health and remove these endpoints
// if the endpoint has been removed via EDS by the control plane
cluster.IgnoreHealthOnHostRemoval = true
default:
cluster.ClusterDiscoveryType = &clusterv3.Cluster_Type{Type: clusterv3.Cluster_STRICT_DNS}
cluster.DnsRefreshRate = durationpb.New(30 * time.Second)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: accesslog-0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: accesslog-0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: accesslog-0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: accesslog-0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: accesslog_otel_0_3
Expand Down Expand Up @@ -255,6 +256,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: accesslog_otel_1_3
Expand Down Expand Up @@ -295,6 +297,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: accesslog_otel_2_3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: accesslog-0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: accesslog-0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: two_example_com_443
Expand Down Expand Up @@ -95,6 +96,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: one_example_com_443
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: two_example_com_443
Expand Down Expand Up @@ -95,6 +96,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: one_example_com_443
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: one_example_com_443
Expand Down Expand Up @@ -47,6 +48,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: two_example_com_80
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
connectTimeout: 10s
dnsLookupFamily: V6_ONLY
dnsRefreshRate: 5s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: httproute/default/httproute-1/rule/0
Expand Down Expand Up @@ -36,6 +37,7 @@
connectTimeout: 10s
dnsLookupFamily: V6_ONLY
dnsRefreshRate: 5s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: grpcroute/default/grpcroute-1/rule/0
Expand Down Expand Up @@ -74,6 +76,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: securitypolicy/envoy-gateway/policy-for-gateway-1/extauth/0
Expand Down Expand Up @@ -106,6 +109,7 @@
connectTimeout: 10s
dnsLookupFamily: ALL
dnsRefreshRate: 5s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: envoyextensionpolicy/default/policy-for-httproute/extproc/0
Expand Down Expand Up @@ -145,6 +149,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_ONLY
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: accesslog_otel_0_1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: securitypolicy/default/policy-for-http-route-1/default/grpc-backend
Expand Down Expand Up @@ -120,6 +121,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: securitypolicy/default/policy-for-gateway-1/envoy-gateway/http-backend
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: securitypolicy/default/policy-for-http-route-1/default/grpc-backend
Expand Down Expand Up @@ -117,6 +118,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: securitypolicy/default/policy-for-gateway-1/envoy-gateway/http-backend
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: securitypolicy/default/policy-for-http-route-1/default/grpc-backend
Expand Down Expand Up @@ -117,6 +118,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: securitypolicy/default/policy-for-gateway-1/envoy-gateway/http-backend
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: first-route-dest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
commonLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
ignoreHealthOnHostRemoval: true
lbPolicy: CLUSTER_PROVIDED
loadBalancingPolicy:
policies:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: localhost_443
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: localhost_80
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: localhost_443
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: localhost_443
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: ratelimit_cluster
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: localhost_443
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: securitypolicy/default/policy-for-route/jwt/0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: oauth_foo_com_443
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: oauth_foo_com_443
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: securitypolicy/envoy-gateway/policy-for-gateway/0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: oauth_foo_com_443
Expand Down Expand Up @@ -95,6 +96,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: oauth_bar_com_443
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: ratelimit_cluster
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: ratelimit_cluster
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: ratelimit_cluster
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
loadAssignment:
clusterName: ratelimit_cluster
Expand Down
Loading