s/prefer-ipv6/enable-ipv6

charts/linkerd-control-plane/templates/destination.yaml

@@ -205,7 +205,7 @@ spec:
         - -identity-trust-domain={{.Values.identityTrustDomain | default .Values.clusterDomain}}
         - -default-opaque-ports={{.Values.proxy.opaquePorts}}
         - -enable-pprof={{.Values.enablePprof | default false}}
-        - -prefer-ipv6={{not .Values.disableIPv6}}
+        - -enable-ipv6={{not .Values.disableIPv6}}
         {{- range (.Values.destinationController).additionalArgs }}
         - {{ . }}
         {{- end }}

controller/api/destination/endpoint_translator.go

@@ -41,7 +41,7 @@ type (
 
 		enableH2Upgrade,
 		enableEndpointFiltering,
-		preferIPv6,
+		enableIPv6,
 
 		extEndpointZoneWeights bool
 
@@ -84,7 +84,7 @@ func newEndpointTranslator(
 	identityTrustDomain string,
 	enableH2Upgrade,
 	enableEndpointFiltering,
-	preferIPv6,
+	enableIPv6,
 	extEndpointZoneWeights bool,
 	service string,
 	srcNodeName string,
@@ -115,7 +115,7 @@ func newEndpointTranslator(
 		defaultOpaquePorts,
 		enableH2Upgrade,
 		enableEndpointFiltering,
-		preferIPv6,
+		enableIPv6,
 		extEndpointZoneWeights,
 		availableEndpoints,
 		filteredSnapshot,
@@ -352,11 +352,11 @@ func (et *endpointTranslator) diffEndpoints(filtered watcher.AddressSet) (watche
 			continue
 		}
 
-		if id.IPFamily == corev1.IPv6Protocol && !et.preferIPv6 {
+		if id.IPFamily == corev1.IPv6Protocol && !et.enableIPv6 {
 			continue
 		}
 
-		if id.IPFamily == corev1.IPv4Protocol && et.preferIPv6 {
+		if id.IPFamily == corev1.IPv4Protocol && et.enableIPv6 {
 			// Only consider IPv4 address for which there's not already an IPv6 alternative
 			if altID, _ := et.altFamily(id, corev1.IPv6Protocol); altID != nil {
 				skipped[id] = new
@@ -368,7 +368,7 @@ func (et *endpointTranslator) diffEndpoints(filtered watcher.AddressSet) (watche
 	}
 
 	// Remove IPv4 alternatives when an IPv6 one appears
-	if et.preferIPv6 {
+	if et.enableIPv6 {
 		for id := range add {
 			if id.IPFamily != corev1.IPv6Protocol {
 				continue
@@ -388,11 +388,11 @@ func (et *endpointTranslator) diffEndpoints(filtered watcher.AddressSet) (watche
 			continue
 		}
 
-		if id.IPFamily == corev1.IPv6Protocol && !et.preferIPv6 {
+		if id.IPFamily == corev1.IPv6Protocol && !et.enableIPv6 {
 			continue
 		}
 
-		if id.IPFamily == corev1.IPv4Protocol && et.preferIPv6 {
+		if id.IPFamily == corev1.IPv4Protocol && et.enableIPv6 {
 			// Only consider IPv4 address for which there's not already an IPv6 alternative
 			if altID, _ := et.altFamily(id, corev1.IPv6Protocol); altID != nil {
 				continue
@@ -401,7 +401,7 @@ func (et *endpointTranslator) diffEndpoints(filtered watcher.AddressSet) (watche
 
 		remove[id] = address
 
-		if id.IPFamily == corev1.IPv6Protocol && et.preferIPv6 {
+		if id.IPFamily == corev1.IPv6Protocol && et.enableIPv6 {
 			// Add IPv4 alternative, if any
 			if altID, addr := et.altFamily(id, corev1.IPv4Protocol); altID != nil {
 				add[*altID] = *addr

controller/api/destination/server.go

@@ -32,7 +32,7 @@ type (
 
 		EnableH2Upgrade,
 		EnableEndpointSlices,
-		PreferIPv6,
+		EnableIPv6,
 		ExtEndpointZoneWeights bool
 
 		DefaultOpaquePorts map[uint32]struct{}
@@ -187,7 +187,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.PreferIPv6,
+			s.config.EnableIPv6,
 			s.config.ExtEndpointZoneWeights,
 			fmt.Sprintf("%s.%s.svc.%s:%d", remoteSvc, service.Namespace, remoteConfig.ClusterDomain, port),
 			token.NodeName,
@@ -219,7 +219,7 @@ func (s *server) Get(dest *pb.GetDestination, stream pb.Destination_GetServer) e
 			s.config.IdentityTrustDomain,
 			s.config.EnableH2Upgrade,
 			true,
-			s.config.PreferIPv6,
+			s.config.EnableIPv6,
 			s.config.ExtEndpointZoneWeights,
 			dest.GetPath(),
 			token.NodeName,

controller/api/destination/test_util.go

@@ -840,7 +840,7 @@ spec:
 		pb.UnimplementedDestinationServer{},
 		Config{
 			EnableH2Upgrade:     true,
-			PreferIPv6:          true,
+			EnableIPv6:          true,
 			ControllerNS:        "linkerd",
 			ClusterDomain:       "mycluster.local",
 			IdentityTrustDomain: "trust.domain",

controller/cmd/destination/main.go

@@ -34,8 +34,8 @@ func Main(args []string) {
 		"Enable transparently upgraded HTTP2 connections among pods in the service mesh")
 	enableEndpointSlices := cmd.Bool("enable-endpoint-slices", true,
 		"Enable the usage of EndpointSlice informers and resources")
-	preferIPv6 := cmd.Bool("prefer-ipv6", true,
-		"Set to true to prefer exposing IPv6 endpoints over IPv4 ones; requires enable-endpoint-slices=true")
+	enableIPv6 := cmd.Bool("enable-ipv6", true,
+		"Set to true to allow discovering IPv6 endpoints and preferring IPv6 when both IPv4 and IPv6 are available")
 	trustDomain := cmd.String("identity-trust-domain", "", "configures the name suffix used for identities")
 	clusterDomain := cmd.String("cluster-domain", "", "kubernetes cluster domain")
 	defaultOpaquePorts := cmd.String("default-opaque-ports", "", "configures the default opaque ports")
@@ -54,7 +54,7 @@ func Main(args []string) {
 
 	flags.ConfigureAndParse(cmd, args)
 
-	if *preferIPv6 && !*enableEndpointSlices {
+	if *enableIPv6 && !*enableEndpointSlices {
 		log.Fatal("If --prefer-ipv6=true then --enable-endpoint-slices needs to be true")
 	}
 
@@ -155,7 +155,7 @@ func Main(args []string) {
 		DefaultOpaquePorts:     opaquePorts,
 		EnableH2Upgrade:        *enableH2Upgrade,
 		EnableEndpointSlices:   *enableEndpointSlices,
-		PreferIPv6:             *preferIPv6,
+		EnableIPv6:             *enableIPv6,
 		ExtEndpointZoneWeights: *extEndpointZoneWeights,
 	}
 	server, err := destination.NewServer(