From 1db02a03498d037132950b9672672627fe5968d7 Mon Sep 17 00:00:00 2001 From: Michael Zalimeni Date: Wed, 7 Jun 2023 15:39:25 -0400 Subject: [PATCH] Disable terminating-gateway for property-override (#17605) More validation is needed to ensure this behaves as expected; in the meantime, align with docs and disable this proxy type. --- .../builtin/property-override/property_override.go | 4 ++-- .../builtin/property-override/property_override_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/agent/envoyextensions/builtin/property-override/property_override.go b/agent/envoyextensions/builtin/property-override/property_override.go index c018d334a5..8164a8092a 100644 --- a/agent/envoyextensions/builtin/property-override/property_override.go +++ b/agent/envoyextensions/builtin/property-override/property_override.go @@ -106,8 +106,8 @@ var Ops = extensioncommon.StringSet{string(OpAdd): {}, string(OpRemove): {}} // validProxyTypes is the set of supported proxy types for this extension. var validProxyTypes = extensioncommon.StringSet{ - string(api.ServiceKindConnectProxy): struct{}{}, - string(api.ServiceKindTerminatingGateway): struct{}{}, + // For now, we only support `connect-proxy`. + string(api.ServiceKindConnectProxy): struct{}{}, } // Patch describes a single patch operation to modify the specific field of matching diff --git a/agent/envoyextensions/builtin/property-override/property_override_test.go b/agent/envoyextensions/builtin/property-override/property_override_test.go index 68a895edb8..ca549353fa 100644 --- a/agent/envoyextensions/builtin/property-override/property_override_test.go +++ b/agent/envoyextensions/builtin/property-override/property_override_test.go @@ -618,7 +618,7 @@ func TestCanApply(t *testing.T) { }, "invalid proxy type": { ext: &propertyOverride{ - ProxyType: api.ServiceKindTerminatingGateway, + ProxyType: api.ServiceKindConnectProxy, }, conf: &extensioncommon.RuntimeConfig{ Kind: api.ServiceKindMeshGateway,