From b95b46c181dc5c0b52da105a93b7a1faa0a1b9a1 Mon Sep 17 00:00:00 2001
From: YaoZengzeng <yaozengzeng@huawei.com>
Date: Tue, 4 Jun 2024 07:20:37 +0000
Subject: [PATCH] use peer_metadata to get pod metadata info from istiod

Signed-off-by: YaoZengzeng <yaozengzeng@huawei.com>
---
 deploy/helm/templates/l7-envoyfilter.yaml | 30 ++++++++++++++++++++---
 deploy/yaml/l7-envoyfilter.yaml           | 30 ++++++++++++++++++++---
 2 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/deploy/helm/templates/l7-envoyfilter.yaml b/deploy/helm/templates/l7-envoyfilter.yaml
index 3465f7bcc..07879b4ac 100644
--- a/deploy/helm/templates/l7-envoyfilter.yaml
+++ b/deploy/helm/templates/l7-envoyfilter.yaml
@@ -20,11 +20,33 @@ spec:
             port_value: 15019
         filter_chains:
         - filters:
-          - name: "envoy.filters.network.tcp_proxy"
+          - name: envoy.filters.network.http_connection_manager
             typed_config:
-              "@type": type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy
-              stat_prefix: main_interval
-              cluster: main_internal
+              "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
+              stat_prefix: kmesh
+              route_config:
+                name: default
+                virtual_hosts:
+                - name: default
+                  domains:
+                  - '*'
+                  routes:
+                  - match:
+                      prefix: "/"
+                    route:
+                      cluster: main_internal
+              http_filters:
+              - name: waypoint_downstream_peer_metadata
+                typed_config:
+                  "@type": type.googleapis.com/udpa.type.v1.TypedStruct
+                  type_url: type.googleapis.com/io.istio.http.peer_metadata.Config
+                  value:
+                    downstream_discovery:
+                    - workload_discovery: {}
+                    shared_with_upstream: true
+              - name: envoy.filters.http.router
+                typed_config:
+                  "@type": type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
         listener_filters:
         - name: "envoy.listener.kmesh_tlv"
           typed_config:
diff --git a/deploy/yaml/l7-envoyfilter.yaml b/deploy/yaml/l7-envoyfilter.yaml
index 3465f7bcc..07879b4ac 100644
--- a/deploy/yaml/l7-envoyfilter.yaml
+++ b/deploy/yaml/l7-envoyfilter.yaml
@@ -20,11 +20,33 @@ spec:
             port_value: 15019
         filter_chains:
         - filters:
-          - name: "envoy.filters.network.tcp_proxy"
+          - name: envoy.filters.network.http_connection_manager
             typed_config:
-              "@type": type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy
-              stat_prefix: main_interval
-              cluster: main_internal
+              "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
+              stat_prefix: kmesh
+              route_config:
+                name: default
+                virtual_hosts:
+                - name: default
+                  domains:
+                  - '*'
+                  routes:
+                  - match:
+                      prefix: "/"
+                    route:
+                      cluster: main_internal
+              http_filters:
+              - name: waypoint_downstream_peer_metadata
+                typed_config:
+                  "@type": type.googleapis.com/udpa.type.v1.TypedStruct
+                  type_url: type.googleapis.com/io.istio.http.peer_metadata.Config
+                  value:
+                    downstream_discovery:
+                    - workload_discovery: {}
+                    shared_with_upstream: true
+              - name: envoy.filters.http.router
+                typed_config:
+                  "@type": type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
         listener_filters:
         - name: "envoy.listener.kmesh_tlv"
           typed_config: