From 306ef7d252be0ea2bc7595f942bc4c881cc46401 Mon Sep 17 00:00:00 2001 From: freddygv Date: Thu, 11 Mar 2021 11:36:35 -0700 Subject: [PATCH] Restore old escape hatch alias --- agent/structs/config_entry.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agent/structs/config_entry.go b/agent/structs/config_entry.go index c6fe9ada51..32bdcc4bfb 100644 --- a/agent/structs/config_entry.go +++ b/agent/structs/config_entry.go @@ -638,7 +638,7 @@ type UpstreamConfig struct { // // Note: This escape hatch is NOT compatible with the discovery chain and // will be ignored if a discovery chain is active. - ListenerJSON string `json:",omitempty" alias:"listener_json"` + ListenerJSON string `json:",omitempty" alias:"listener_json,envoy_listener_json"` // ClusterJSON is a complete override ("escape hatch") for the upstream's // cluster. The Connect client TLS certificate and context will be injected @@ -646,7 +646,7 @@ type UpstreamConfig struct { // // Note: This escape hatch is NOT compatible with the discovery chain and // will be ignored if a discovery chain is active. - ClusterJSON string `alias:"cluster_json"` + ClusterJSON string `alias:"cluster_json,envoy_cluster_json"` // Protocol describes the upstream's service protocol. Valid values are "tcp", // "http" and "grpc". Anything else is treated as tcp. The enables protocol