mirror of https://github.com/linkerd/linkerd2.git
destination: Rename zone weighting flag to ext-endpoint-zone-weights (#12090)
This commit is contained in:
parent
80c5086049
commit
2ab76b64c6
|
@ -41,7 +41,7 @@ type (
|
|||
|
||||
enableH2Upgrade,
|
||||
enableEndpointFiltering,
|
||||
experimentalEndpointZoneWeights bool
|
||||
extEndpointZoneWeights bool
|
||||
|
||||
availableEndpoints watcher.AddressSet
|
||||
filteredSnapshot watcher.AddressSet
|
||||
|
@ -82,7 +82,7 @@ func newEndpointTranslator(
|
|||
identityTrustDomain string,
|
||||
enableH2Upgrade,
|
||||
enableEndpointFiltering,
|
||||
experimentalEndpointZoneWeights bool,
|
||||
extEndpointZoneWeights bool,
|
||||
service string,
|
||||
srcNodeName string,
|
||||
defaultOpaquePorts map[uint32]struct{},
|
||||
|
@ -112,7 +112,7 @@ func newEndpointTranslator(
|
|||
defaultOpaquePorts,
|
||||
enableH2Upgrade,
|
||||
enableEndpointFiltering,
|
||||
experimentalEndpointZoneWeights,
|
||||
extEndpointZoneWeights,
|
||||
availableEndpoints,
|
||||
filteredSnapshot,
|
||||
stream,
|
||||
|
@ -430,7 +430,7 @@ func (et *endpointTranslator) sendClientAdd(set watcher.AddressSet) {
|
|||
}
|
||||
}
|
||||
|
||||
if et.experimentalEndpointZoneWeights {
|
||||
if et.extEndpointZoneWeights {
|
||||
// EXPERIMENTAL: Use the endpoint weight field to indicate zonal
|
||||
// preference so that local endoints are more heavily weighted.
|
||||
if et.nodeTopologyZone != "" && address.Zone != nil && *address.Zone == et.nodeTopologyZone {
|
||||
|
|
|
@ -686,7 +686,7 @@ func TestEndpointTranslatorExperimentalZoneWeights(t *testing.T) {
|
|||
|
||||
t.Run("Disabled", func(t *testing.T) {
|
||||
mockGetServer, translator := makeEndpointTranslator(t)
|
||||
translator.experimentalEndpointZoneWeights = false
|
||||
translator.extEndpointZoneWeights = false
|
||||
translator.Start()
|
||||
defer translator.Stop()
|
||||
|
||||
|
@ -705,7 +705,7 @@ func TestEndpointTranslatorExperimentalZoneWeights(t *testing.T) {
|
|||
|
||||
t.Run("Applies weights", func(t *testing.T) {
|
||||
mockGetServer, translator := makeEndpointTranslator(t)
|
||||
translator.experimentalEndpointZoneWeights = true
|
||||
translator.extEndpointZoneWeights = true
|
||||
translator.Start()
|
||||
defer translator.Stop()
|
||||
|
||||
|
|
|
@ -32,7 +32,7 @@ type (
|
|||
|
||||
EnableH2Upgrade,
|
||||
EnableEndpointSlices,
|
||||
ExperimentalEndpointZoneWeights bool
|
||||
ExtEndpointZoneWeights bool
|
||||
|
||||
DefaultOpaquePorts map[uint32]struct{}
|
||||
}
|
||||
|
@ -186,7 +186,7 @@ func (s *server) Get(dest *pb.GetDestination, stream pb.Destination_GetServer) e
|
|||
remoteConfig.TrustDomain,
|
||||
s.config.EnableH2Upgrade,
|
||||
false, // Disable endpoint filtering for remote discovery.
|
||||
s.config.ExperimentalEndpointZoneWeights,
|
||||
s.config.ExtEndpointZoneWeights,
|
||||
fmt.Sprintf("%s.%s.svc.%s:%d", remoteSvc, service.Namespace, remoteConfig.ClusterDomain, port),
|
||||
token.NodeName,
|
||||
s.config.DefaultOpaquePorts,
|
||||
|
@ -217,7 +217,7 @@ func (s *server) Get(dest *pb.GetDestination, stream pb.Destination_GetServer) e
|
|||
s.config.IdentityTrustDomain,
|
||||
s.config.EnableH2Upgrade,
|
||||
true,
|
||||
s.config.ExperimentalEndpointZoneWeights,
|
||||
s.config.ExtEndpointZoneWeights,
|
||||
dest.GetPath(),
|
||||
token.NodeName,
|
||||
s.config.DefaultOpaquePorts,
|
||||
|
|
|
@ -757,7 +757,7 @@ metadata:
|
|||
"trust.domain",
|
||||
true,
|
||||
true, // enableEndpointFiltering
|
||||
false, // experimentalEndpointZoneWeights
|
||||
false, // extEndpointZoneWeights
|
||||
"service-name.service-ns",
|
||||
"test-123",
|
||||
map[uint32]struct{}{},
|
||||
|
|
|
@ -45,7 +45,7 @@ func Main(args []string) {
|
|||
// Zone weighting is disabled by default because it is not consumed by
|
||||
// proxies. This feature exists to support experimentation on top of the
|
||||
// Linkerd control plane API.
|
||||
experimentalEndpointZoneWeights := cmd.Bool("experimental-endpoint-zone-weights", false,
|
||||
extEndpointZoneWeights := cmd.Bool("ext-endpoint-zone-weights", false,
|
||||
"Enable setting endpoint weighting based on zone locality")
|
||||
|
||||
flags.ConfigureAndParse(cmd, args)
|
||||
|
@ -137,13 +137,13 @@ func Main(args []string) {
|
|||
}
|
||||
|
||||
config := destination.Config{
|
||||
ControllerNS: *controllerNamespace,
|
||||
IdentityTrustDomain: *trustDomain,
|
||||
ClusterDomain: *clusterDomain,
|
||||
DefaultOpaquePorts: opaquePorts,
|
||||
EnableH2Upgrade: *enableH2Upgrade,
|
||||
EnableEndpointSlices: *enableEndpointSlices,
|
||||
ExperimentalEndpointZoneWeights: *experimentalEndpointZoneWeights,
|
||||
ControllerNS: *controllerNamespace,
|
||||
IdentityTrustDomain: *trustDomain,
|
||||
ClusterDomain: *clusterDomain,
|
||||
DefaultOpaquePorts: opaquePorts,
|
||||
EnableH2Upgrade: *enableH2Upgrade,
|
||||
EnableEndpointSlices: *enableEndpointSlices,
|
||||
ExtEndpointZoneWeights: *extEndpointZoneWeights,
|
||||
}
|
||||
server, err := destination.NewServer(
|
||||
*addr,
|
||||
|
|
Loading…
Reference in New Issue