Explicitly enable WebSocket upgrades (#18150)

This PR explicitly enables WebSocket upgrades in Envoy's UpgradeConfig for all proxy types. (API Gateway, Ingress, and Sidecar.) Fixes #8283
hashicorp · Jul 20, 2023 · 2c5a09b · 2c5a09b
1 parent ada767f
commit 2c5a09b
Show file tree

Hide file tree

Showing 81 changed files with 4,035 additions and 3,893 deletions.
diff --git a/.changelog/18150.txt b/.changelog/18150.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+xds: Explicitly enable WebSocket connection upgrades in HTTP connection manager
+```
diff --git a/agent/xds/listeners.go b/agent/xds/listeners.go
@@ -2470,6 +2470,10 @@ func makeHTTPFilter(opts listenerFilterOpts) (*envoy_listener_v3.Filter, error)
 			// sampled.
 			RandomSampling: &envoy_type_v3.Percent{Value: 0.0},
 		},
+		// Explicitly enable WebSocket upgrades for all HTTP listeners
+		UpgradeConfigs: []*envoy_http_v3.HttpConnectionManager_UpgradeConfig{
+			{UpgradeType: "websocket"},
+		},
 	}
 
 	if opts.tracing != nil {

diff --git a/.../xds/testdata/builtin_extension/listeners/ext-authz-http-local-grpc-service.latest.golden b/.../xds/testdata/builtin_extension/listeners/ext-authz-http-local-grpc-service.latest.golden
@@ -209,7 +209,12 @@
                   "chain": true,
                   "dns": true,
                   "uri": true
-                }
+                },
+                "upgradeConfigs": [
+                  {
+                    "upgradeType": "websocket"
+                  }
+                ]
               }
             }
           ],
@@ -248,4 +253,4 @@
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
   "nonce": "00000001"
-}
+}
diff --git a/.../xds/testdata/builtin_extension/listeners/ext-authz-http-local-http-service.latest.golden b/.../xds/testdata/builtin_extension/listeners/ext-authz-http-local-http-service.latest.golden
@@ -210,7 +210,12 @@
                   "chain": true,
                   "dns": true,
                   "uri": true
-                }
+                },
+                "upgradeConfigs": [
+                  {
+                    "upgradeType": "websocket"
+                  }
+                ]
               }
             }
           ],
@@ -249,4 +254,4 @@
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
   "nonce": "00000001"
-}
+}
diff --git a/...s/testdata/builtin_extension/listeners/ext-authz-http-upstream-grpc-service.latest.golden b/...s/testdata/builtin_extension/listeners/ext-authz-http-upstream-grpc-service.latest.golden
@@ -233,7 +233,12 @@
                   "chain": true,
                   "dns": true,
                   "uri": true
-                }
+                },
+                "upgradeConfigs": [
+                  {
+                    "upgradeType": "websocket"
+                  }
+                ]
               }
             }
           ],
@@ -272,4 +277,4 @@
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
   "nonce": "00000001"
-}
+}
diff --git a/...s/testdata/builtin_extension/listeners/ext-authz-http-upstream-http-service.latest.golden b/...s/testdata/builtin_extension/listeners/ext-authz-http-upstream-http-service.latest.golden
@@ -309,7 +309,12 @@
                   "chain": true,
                   "dns": true,
                   "uri": true
-                }
+                },
+                "upgradeConfigs": [
+                  {
+                    "upgradeType": "websocket"
+                  }
+                ]
               }
             }
           ],
@@ -348,4 +353,4 @@
   ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
   "nonce": "00000001"
-}
+}