Skip to content

Commit 79b0bac

Browse files
jukiedavem-git
jukie
authored and
davem-git
committed
Use cluster.loadBalancingPolicy instead of commonLbConfig (envoyproxy#5833)
* Use cluster.loadBalancingPolicy instead of commonLbConfig Signed-off-by: jukie <[email protected]>
1 parent 13d49b3 commit 79b0bac

File tree

190 files changed

+4060
-1213
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

190 files changed

+4060
-1213
lines changed

‎internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml‎

Lines changed: 45 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -815,8 +815,7 @@ xds:
815815
circuitBreakers:
816816
thresholds:
817817
- maxRetries: 1024
818-
commonLbConfig:
819-
localityWeightedLbConfig: {}
818+
commonLbConfig: {}
820819
connectTimeout: 10s
821820
dnsLookupFamily: V4_PREFERRED
822821
edsClusterConfig:
@@ -826,6 +825,14 @@ xds:
826825
serviceName: httproute/default/backend/rule/0
827826
ignoreHealthOnHostRemoval: true
828827
lbPolicy: LEAST_REQUEST
828+
loadBalancingPolicy:
829+
policies:
830+
- typedExtensionConfig:
831+
name: envoy.load_balancing_policies.least_request
832+
typedConfig:
833+
'@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest
834+
localityLbConfig:
835+
localityWeightedLbConfig: {}
829836
metadata:
830837
filterMetadata:
831838
envoy-gateway:
@@ -842,8 +849,7 @@ xds:
842849
circuitBreakers:
843850
thresholds:
844851
- maxRetries: 1024
845-
commonLbConfig:
846-
localityWeightedLbConfig: {}
852+
commonLbConfig: {}
847853
connectTimeout: 10s
848854
dnsLookupFamily: V4_PREFERRED
849855
edsClusterConfig:
@@ -853,6 +859,14 @@ xds:
853859
serviceName: grpcroute/default/backend/rule/0
854860
ignoreHealthOnHostRemoval: true
855861
lbPolicy: LEAST_REQUEST
862+
loadBalancingPolicy:
863+
policies:
864+
- typedExtensionConfig:
865+
name: envoy.load_balancing_policies.least_request
866+
typedConfig:
867+
'@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest
868+
localityLbConfig:
869+
localityWeightedLbConfig: {}
856870
metadata:
857871
filterMetadata:
858872
envoy-gateway:
@@ -875,8 +889,7 @@ xds:
875889
circuitBreakers:
876890
thresholds:
877891
- maxRetries: 1024
878-
commonLbConfig:
879-
localityWeightedLbConfig: {}
892+
commonLbConfig: {}
880893
connectTimeout: 10s
881894
dnsLookupFamily: V4_PREFERRED
882895
edsClusterConfig:
@@ -886,6 +899,14 @@ xds:
886899
serviceName: tcproute/default/backend/rule/-1
887900
ignoreHealthOnHostRemoval: true
888901
lbPolicy: LEAST_REQUEST
902+
loadBalancingPolicy:
903+
policies:
904+
- typedExtensionConfig:
905+
name: envoy.load_balancing_policies.least_request
906+
typedConfig:
907+
'@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest
908+
localityLbConfig:
909+
localityWeightedLbConfig: {}
889910
metadata:
890911
filterMetadata:
891912
envoy-gateway:
@@ -901,8 +922,7 @@ xds:
901922
circuitBreakers:
902923
thresholds:
903924
- maxRetries: 1024
904-
commonLbConfig:
905-
localityWeightedLbConfig: {}
925+
commonLbConfig: {}
906926
connectTimeout: 10s
907927
dnsLookupFamily: V4_PREFERRED
908928
edsClusterConfig:
@@ -912,6 +932,14 @@ xds:
912932
serviceName: tlsroute/default/backend/rule/-1
913933
ignoreHealthOnHostRemoval: true
914934
lbPolicy: LEAST_REQUEST
935+
loadBalancingPolicy:
936+
policies:
937+
- typedExtensionConfig:
938+
name: envoy.load_balancing_policies.least_request
939+
typedConfig:
940+
'@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest
941+
localityLbConfig:
942+
localityWeightedLbConfig: {}
915943
metadata:
916944
filterMetadata:
917945
envoy-gateway:
@@ -927,8 +955,7 @@ xds:
927955
circuitBreakers:
928956
thresholds:
929957
- maxRetries: 1024
930-
commonLbConfig:
931-
localityWeightedLbConfig: {}
958+
commonLbConfig: {}
932959
connectTimeout: 10s
933960
dnsLookupFamily: V4_PREFERRED
934961
edsClusterConfig:
@@ -938,6 +965,14 @@ xds:
938965
serviceName: udproute/default/backend/rule/-1
939966
ignoreHealthOnHostRemoval: true
940967
lbPolicy: LEAST_REQUEST
968+
loadBalancingPolicy:
969+
policies:
970+
- typedExtensionConfig:
971+
name: envoy.load_balancing_policies.least_request
972+
typedConfig:
973+
'@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest
974+
localityLbConfig:
975+
localityWeightedLbConfig: {}
941976
metadata:
942977
filterMetadata:
943978
envoy-gateway:

‎internal/cmd/egctl/testdata/translate/out/echo-gateway-api.cluster.yaml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,7 @@ xds:
106106
circuitBreakers:
107107
thresholds:
108108
- maxRetries: 1024
109-
commonLbConfig:
110-
localityWeightedLbConfig: {}
109+
commonLbConfig: {}
111110
connectTimeout: 10s
112111
dnsLookupFamily: V4_PREFERRED
113112
edsClusterConfig:
@@ -117,6 +116,14 @@ xds:
117116
serviceName: httproute/envoy-gateway-system/backend/rule/0
118117
ignoreHealthOnHostRemoval: true
119118
lbPolicy: LEAST_REQUEST
119+
loadBalancingPolicy:
120+
policies:
121+
- typedExtensionConfig:
122+
name: envoy.load_balancing_policies.least_request
123+
typedConfig:
124+
'@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest
125+
localityLbConfig:
126+
localityWeightedLbConfig: {}
120127
metadata:
121128
filterMetadata:
122129
envoy-gateway:

‎internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json‎

Lines changed: 80 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -491,9 +491,7 @@
491491
}
492492
]
493493
},
494-
"commonLbConfig": {
495-
"localityWeightedLbConfig": {}
496-
},
494+
"commonLbConfig": {},
497495
"connectTimeout": "10s",
498496
"dnsLookupFamily": "V4_PREFERRED",
499497
"edsClusterConfig": {
@@ -505,6 +503,21 @@
505503
},
506504
"ignoreHealthOnHostRemoval": true,
507505
"lbPolicy": "LEAST_REQUEST",
506+
"loadBalancingPolicy": {
507+
"policies": [
508+
{
509+
"typedExtensionConfig": {
510+
"name": "envoy.load_balancing_policies.least_request",
511+
"typedConfig": {
512+
"@type": "type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest",
513+
"localityLbConfig": {
514+
"localityWeightedLbConfig": {}
515+
}
516+
}
517+
}
518+
}
519+
]
520+
},
508521
"metadata": {
509522
"filterMetadata": {
510523
"envoy-gateway": {
@@ -533,9 +546,7 @@
533546
}
534547
]
535548
},
536-
"commonLbConfig": {
537-
"localityWeightedLbConfig": {}
538-
},
549+
"commonLbConfig": {},
539550
"connectTimeout": "10s",
540551
"dnsLookupFamily": "V4_PREFERRED",
541552
"edsClusterConfig": {
@@ -547,6 +558,21 @@
547558
},
548559
"ignoreHealthOnHostRemoval": true,
549560
"lbPolicy": "LEAST_REQUEST",
561+
"loadBalancingPolicy": {
562+
"policies": [
563+
{
564+
"typedExtensionConfig": {
565+
"name": "envoy.load_balancing_policies.least_request",
566+
"typedConfig": {
567+
"@type": "type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest",
568+
"localityLbConfig": {
569+
"localityWeightedLbConfig": {}
570+
}
571+
}
572+
}
573+
}
574+
]
575+
},
550576
"metadata": {
551577
"filterMetadata": {
552578
"envoy-gateway": {
@@ -586,9 +612,7 @@
586612
}
587613
]
588614
},
589-
"commonLbConfig": {
590-
"localityWeightedLbConfig": {}
591-
},
615+
"commonLbConfig": {},
592616
"connectTimeout": "10s",
593617
"dnsLookupFamily": "V4_PREFERRED",
594618
"edsClusterConfig": {
@@ -600,6 +624,21 @@
600624
},
601625
"ignoreHealthOnHostRemoval": true,
602626
"lbPolicy": "LEAST_REQUEST",
627+
"loadBalancingPolicy": {
628+
"policies": [
629+
{
630+
"typedExtensionConfig": {
631+
"name": "envoy.load_balancing_policies.least_request",
632+
"typedConfig": {
633+
"@type": "type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest",
634+
"localityLbConfig": {
635+
"localityWeightedLbConfig": {}
636+
}
637+
}
638+
}
639+
}
640+
]
641+
},
603642
"metadata": {
604643
"filterMetadata": {
605644
"envoy-gateway": {
@@ -628,9 +667,7 @@
628667
}
629668
]
630669
},
631-
"commonLbConfig": {
632-
"localityWeightedLbConfig": {}
633-
},
670+
"commonLbConfig": {},
634671
"connectTimeout": "10s",
635672
"dnsLookupFamily": "V4_PREFERRED",
636673
"edsClusterConfig": {
@@ -642,6 +679,21 @@
642679
},
643680
"ignoreHealthOnHostRemoval": true,
644681
"lbPolicy": "LEAST_REQUEST",
682+
"loadBalancingPolicy": {
683+
"policies": [
684+
{
685+
"typedExtensionConfig": {
686+
"name": "envoy.load_balancing_policies.least_request",
687+
"typedConfig": {
688+
"@type": "type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest",
689+
"localityLbConfig": {
690+
"localityWeightedLbConfig": {}
691+
}
692+
}
693+
}
694+
}
695+
]
696+
},
645697
"metadata": {
646698
"filterMetadata": {
647699
"envoy-gateway": {
@@ -670,9 +722,7 @@
670722
}
671723
]
672724
},
673-
"commonLbConfig": {
674-
"localityWeightedLbConfig": {}
675-
},
725+
"commonLbConfig": {},
676726
"connectTimeout": "10s",
677727
"dnsLookupFamily": "V4_PREFERRED",
678728
"edsClusterConfig": {
@@ -684,6 +734,21 @@
684734
},
685735
"ignoreHealthOnHostRemoval": true,
686736
"lbPolicy": "LEAST_REQUEST",
737+
"loadBalancingPolicy": {
738+
"policies": [
739+
{
740+
"typedExtensionConfig": {
741+
"name": "envoy.load_balancing_policies.least_request",
742+
"typedConfig": {
743+
"@type": "type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest",
744+
"localityLbConfig": {
745+
"localityWeightedLbConfig": {}
746+
}
747+
}
748+
}
749+
}
750+
]
751+
},
687752
"metadata": {
688753
"filterMetadata": {
689754
"envoy-gateway": {

0 commit comments

Comments
 (0)