Merge branch 'main' into kruti/fix-ipv6-address-handling

Author: krutibaraiya

.changelog/22226.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+wan-federation: Fixed an issue where advertised IPv6 addresses were causing WAN federation to fail.
+```

agent/consul/server.go

@@ -781,7 +781,7 @@ func NewServer(config *Config, flat Deps, externalGRPCServer *grpc.Server,
 			if err != nil {
 				return "", err
 			}
-			return fmt.Sprintf("%s:%d", addr, s.WanJoinPort), nil
+			return net.JoinHostPort(addr, strconv.Itoa(s.WanJoinPort)), nil
 		}
 		go s.Flood(addrFn, s.serfWAN)
 	}

agent/grpc-internal/client.go

@@ -101,7 +101,28 @@ const grpcServiceConfig = `
 				{
 					"service": "subscribe.StateChangeSubscription",
 					"method": "Subscribe"
-				},
+				}
+			],
+			"retryPolicy": {
+				"MaxAttempts": 5,
+				"BackoffMultiplier": 2,
+				"InitialBackoff": "1s",
+				"MaxBackoff": "5s",
+				"RetryableStatusCodes": [
+					"CANCELLED",
+					"UNKNOWN",
+					"DEADLINE_EXCEEDED",
+					"RESOURCE_EXHAUSTED",
+					"FAILED_PRECONDITION",
+					"ABORTED",
+					"OUT_OF_RANGE",
+					"INTERNAL",
+					"UNAVAILABLE"
+				]
+			}
+		},
+		{
+			"name": [
 				{
 					"service": "partition.PartitionService",
 					"method": "List"
@@ -112,8 +133,8 @@ const grpcServiceConfig = `
 				}
 			],
 			"retryPolicy": {
-				"MaxAttempts": 5,
-				"BackoffMultiplier": 2,
+				"MaxAttempts": 3,
+				"BackoffMultiplier": 1.1,
 				"InitialBackoff": "1s",
 				"MaxBackoff": "5s",
 				"RetryableStatusCodes": [

envoyextensions/xdscommon/ENVOY_VERSIONS

@@ -8,9 +8,6 @@
 #
 # See https://developer.hashicorp.com/docs/connect/proxies/envoy#supported-versions for more information on Consul's Envoy
 # version support.
-1.33.0
-1.32.3
-1.31.5
-1.30.9
-1.29.12
-1.28.7
+1.33.2
+1.32.5
+1.31.8