Repository: kumahq/kuma
Pull request #2373 (2021-07-15 04:13:54)

fix(*) use the typed config for TLS Inspector
### Summary

The TLS Inspector has its own typed config protobuf that we should use
for the filter rather than an empty protobuf.

### Full changelog

N/A

### Issues resolved

N/A

### Documentation

N/A

### Testing

- [x] Unit tests
- [x] E2E tests
- [ ] Manual testing on Universal
- [ ] Manual testing on Kubernetes 

### Backwards compatibility

- [x] Add `backport-to-stable` label if the code is backwards compatible. Otherwise, list breaking changes.


codecov-commenter: # [Codecov](https://codecov.io/gh/kumahq/kuma/pull/2373?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=kumahq) Report
> Merging [#2373](https://codecov.io/gh/kumahq/kuma/pull/2373?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=kumahq) (ccbdf14) into [master](https://codecov.io/gh/kumahq/kuma/commit/b0c72d13915a59e4314afc26e4eb65e6384d714a?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=kumahq) (b0c72d1) will **increase** coverage by `0.41%`.
> The diff coverage is `100.00%`.

[![Impacted file tree graph](https://codecov.io/gh/kumahq/kuma/pull/2373/graphs/tree.svg?width=650&height=150&src=pr&token=D7Yvqs6rwV&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=kumahq)](https://codecov.io/gh/kumahq/kuma/pull/2373?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=kumahq)

```diff
@@            Coverage Diff             @@
##           master    #2373      +/-   ##
==========================================
+ Coverage   52.13%   52.54%   +0.41%     
==========================================
  Files         874      878       +4     
  Lines       47826    47867      +41     
==========================================
+ Hits        24936    25154     +218     
+ Misses      20865    20662     -203     
- Partials     2025     2051      +26     
```


| [Impacted Files](https://codecov.io/gh/kumahq/kuma/pull/2373?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=kumahq) | Coverage Δ | |
|---|---|---|
| [...xds/envoy/listeners/v3/tls\_inspector\_configurer.go](https://codecov.io/gh/kumahq/kuma/pull/2373/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=kumahq#diff-cGtnL3hkcy9lbnZveS9saXN0ZW5lcnMvdjMvdGxzX2luc3BlY3Rvcl9jb25maWd1cmVyLmdv) | `81.81% <100.00%> (ø)` | |
| [api/internal/util/proto/types.go](https://codecov.io/gh/kumahq/kuma/pull/2373/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=kumahq#diff-YXBpL2ludGVybmFsL3V0aWwvcHJvdG8vdHlwZXMuZ28=) | `100.00% <0.00%> (ø)` | |
| [api/internal/util/proto/proto.go](https://codecov.io/gh/kumahq/kuma/pull/2373/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=kumahq#diff-YXBpL2ludGVybmFsL3V0aWwvcHJvdG8vcHJvdG8uZ28=) | `70.00% <0.00%> (ø)` | |
| [...kg/plugins/resources/k8s/native/pkg/test/within.go](https://codecov.io/gh/kumahq/kuma/pull/2373/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=kumahq#diff-cGtnL3BsdWdpbnMvcmVzb3VyY2VzL2s4cy9uYXRpdmUvcGtnL3Rlc3Qvd2l0aGluLmdv) | `100.00% <0.00%> (ø)` | |
| [...k8s/native/controllers/proxytemplate\_controller.go](https://codecov.io/gh/kumahq/kuma/pull/2373/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=kumahq#diff-cGtnL3BsdWdpbnMvcmVzb3VyY2VzL2s4cy9uYXRpdmUvY29udHJvbGxlcnMvcHJveHl0ZW1wbGF0ZV9jb250cm9sbGVyLmdv) | `0.00% <0.00%> (ø)` | |
| [pkg/xds/generator/direct\_access\_proxy\_generator.go](https://codecov.io/gh/kumahq/kuma/pull/2373/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=kumahq#diff-cGtnL3hkcy9nZW5lcmF0b3IvZGlyZWN0X2FjY2Vzc19wcm94eV9nZW5lcmF0b3IuZ28=) | `83.90% <0.00%> (+1.14%)` | :arrow_up: |
| [api/mesh/v1alpha1/dataplane\_helpers.go](https://codecov.io/gh/kumahq/kuma/pull/2373/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=kumahq#diff-YXBpL21lc2gvdjFhbHBoYTEvZGF0YXBsYW5lX2hlbHBlcnMuZ28=) | `80.16% <0.00%> (+1.68%)` | :arrow_up: |
| [pkg/plugins/resources/memory/store.go](https://codecov.io/gh/kumahq/kuma/pull/2373/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=kumahq#diff-cGtnL3BsdWdpbnMvcmVzb3VyY2VzL21lbW9yeS9zdG9yZS5nbw==) | `82.06% <0.00%> (+4.34%)` | :arrow_up: |
| [api/mesh/v1alpha1/dataplane\_insight\_helpers.go](https://codecov.io/gh/kumahq/kuma/pull/2373/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=kumahq#diff-YXBpL21lc2gvdjFhbHBoYTEvZGF0YXBsYW5lX2luc2lnaHRfaGVscGVycy5nbw==) | `83.33% <0.00%> (+5.20%)` | :arrow_up: |
| [pkg/xds/cache/once/cache.go](https://codecov.io/gh/kumahq/kuma/pull/2373/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=kumahq#diff-cGtnL3hkcy9jYWNoZS9vbmNlL2NhY2hlLmdv) | `94.87% <0.00%> (+7.69%)` | :arrow_up: |
| ... and [7 more](https://codecov.io/gh/kumahq/kuma/pull/2373/diff?src=pr&el=tree-more&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=kumahq) | |

------

[Continue to review full report at Codecov](https://codecov.io/gh/kumahq/kuma/pull/2373?src=pr&el=continue&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=kumahq).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=kumahq)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/kumahq/kuma/pull/2373?src=pr&el=footer&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=kumahq). Last update [b0c72d1...ccbdf14](https://codecov.io/gh/kumahq/kuma/pull/2373?src=pr&el=lastupdated&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=kumahq). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=kumahq).


Patch:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b83cbec4f..be13a6923 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,31 @@
 # CHANGELOG
 
+## [1.2.2]
+> Released on 2021/07/16
+
+Changes:
+* feat: add datadog traffic tracing [#2269](https://github.com//kumahq/kuma/pull/2247)
+* refactor: add kumactl install tracing context [#2343](https://github.com//kumahq/kuma/pull/2343)
+* chore: improve kumactl install transparent-proxy flags description, add extra validation [#2352](https://github.com//kumahq/kuma/pull/2352)
+* fix: broken SDS auth and XDS generation on rapid DP restarts [#2342](https://github.com//kumahq/kuma/pull/2342)
+* fix: allow verbose log levels [#2351](https://github.com//kumahq/kuma/pull/2351)
+* chore: use resource types for DataplaneInsight tracking [#2324](https://github.com//kumahq/kuma/pull/2324)
+* chore: improve resource manager initialization readability [#2316](https://github.com//kumahq/kuma/pull/2316)
+* chore: upgrade gui to new version [#2340](https://github.com//kumahq/kuma/pull/2340), [#2325](https://github.com//kumahq/kuma/pull/2325), [#2315](https://github.com//kumahq/kuma/pull/2315)
+* fix: allocate a new VIP for ExternalService host [#2302](https://github.com//kumahq/kuma/pull/2302)
+* fix: stop components on leader election lost [#2318](https://github.com//kumahq/kuma/pull/2318)
+* chore: generate system resource wrappers [#2282](https://github.com//kumahq/kuma/pull/2282), [#2311](https://github.com//kumahq/kuma/pull/2311)
+* chore: remove access log V2 [#2301](https://github.com//kumahq/kuma/pull/2301)
+* chore: generate DeepCopy interfaces [#2222](https://github.com//kumahq/kuma/pull/2222)
+* chore: disable log sampling [#2273](https://github.com//kumahq/kuma/pull/2273)
+* chore: upgrade Protocol Buffers [#2244](https://github.com//kumahq/kuma/pull/2244)
+* chore: change default number of insights subscriptions [#2266](https://github.com//kumahq/kuma/pull/2266)
+* chore: make the authentication interface type oblivious [#2271](https://github.com//kumahq/kuma/pull/2271)
+* fix: fix hds disabled on dpserver [#2268](https://github.com//kumahq/kuma/pull/2268)
+ 👍contributed by Bastien Chatelard
+* chore: refactor xDS metadata to store a generic resource [#2264](https://github.com//kumahq/kuma/pull/2264)
+* feat: change KDS max message limit [#2265](https://github.com//kumahq/kuma/pull/2265)
+
 ## [1.2.1]
 > Released on  2021/06/30
 
diff --git a/deployments/charts/kuma/Chart.yaml b/deployments/charts/kuma/Chart.yaml
index 3bd32ceb0..9967feb21 100644
--- a/deployments/charts/kuma/Chart.yaml
+++ b/deployments/charts/kuma/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: kuma
 description: A Helm chart for the Kuma Control Plane
 type: application
-version: 0.6.1
-appVersion: 1.2.1
+version: 0.6.2
+appVersion: 1.2.2
 home: https://github.com/kumahq/kuma
 maintainers:
   - name: austince
diff --git a/deployments/charts/kuma/README.md b/deployments/charts/kuma/README.md
index 64b50014d..30d284834 100644
--- a/deployments/charts/kuma/README.md
+++ b/deployments/charts/kuma/README.md
@@ -2,7 +2,7 @@
 
 A Helm chart for the Kuma Control Plane
 
-![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![Version: 0.6.1](https://img.shields.io/badge/Version-0.6.1-informational?style=flat-square) ![AppVersion: 1.2.1](https://img.shields.io/badge/AppVersion-1.2.1-informational?style=flat-square)
+![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![Version: 0.6.2](https://img.shields.io/badge/Version-0.6.2-informational?style=flat-square) ![AppVersion: 1.2.2](https://img.shields.io/badge/AppVersion-1.2.2-informational?style=flat-square)
 
 **Homepage:** <https://github.com/kumahq/kuma>
 
diff --git a/pkg/dns/vips/interfaces.go b/pkg/dns/vips/interfaces.go
index 61de0f6c0..9c79c13a2 100644
--- a/pkg/dns/vips/interfaces.go
+++ b/pkg/dns/vips/interfaces.go
@@ -12,17 +12,28 @@ const (
 	Host
 )
 
+func (t EntryType) String() string {
+	switch t {
+	case Service:
+		return "service"
+	case Host:
+		return "host"
+	default:
+		return "undefined"
+	}
+}
+
 type Entry struct {
 	Type EntryType `json:"type"`
 	Name string    `json:"name"`
 }
 
 func (e Entry) String() string {
-	return fmt.Sprintf("%v:%s", e.Type, e.Name)
+	return fmt.Sprintf("%s:%s", e.Type, e.Name)
 }
 
 func (e Entry) MarshalText() (text []byte, err error) {
-	return []byte(e.String()), nil
+	return []byte(fmt.Sprintf("%d:%s", e.Type, e.Name)), nil
 }
 
 func (e *Entry) UnmarshalText(text []byte) error {
@@ -45,7 +56,9 @@ func (s EntrySet) ToArray() (entries []Entry) {
 		entries = append(entries, entry)
 	}
 	sort.SliceStable(entries, func(i, j int) bool {
-		return entries[i].String() < entries[j].String()
+		// Sort by entry type, then name.
+		return entries[i].Type < entries[j].Type ||
+			entries[i].Name < entries[j].Name
 	})
 	return
 }
diff --git a/pkg/xds/envoy/listeners/v3/tls_inspector_configurer.go b/pkg/xds/envoy/listeners/v3/tls_inspector_configurer.go
index 74201767f..ee741e28c 100644
--- a/pkg/xds/envoy/listeners/v3/tls_inspector_configurer.go
+++ b/pkg/xds/envoy/listeners/v3/tls_inspector_configurer.go
@@ -2,7 +2,7 @@ package v3
 
 import (
 	envoy_listener "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
-	"github.com/golang/protobuf/ptypes/empty"
+	envoy_extensions_filters_listener_tls_inspector_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/listener/tls_inspector/v3"
 
 	"github.com/kumahq/kuma/pkg/util/proto"
 )
@@ -13,7 +13,7 @@ type TLSInspectorConfigurer struct {
 var _ ListenerConfigurer = &TLSInspectorConfigurer{}
 
 func (c *TLSInspectorConfigurer) Configure(l *envoy_listener.Listener) error {
-	any, err := proto.MarshalAnyDeterministic(&empty.Empty{})
+	any, err := proto.MarshalAnyDeterministic(&envoy_extensions_filters_listener_tls_inspector_v3.TlsInspector{})
 	if err != nil {
 		return err
 	}


Test patch:
diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.cni-enabled.golden.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.cni-enabled.golden.yaml
index ed37af00c..95d77d812 100644
--- a/app/kumactl/cmd/install/testdata/install-control-plane.cni-enabled.golden.yaml
+++ b/app/kumactl/cmd/install/testdata/install-control-plane.cni-enabled.golden.yaml
@@ -892,7 +892,7 @@ spec:
         # priority scheduling and that its resources are reserved
         # if it ever gets evicted.
         scheduler.alpha.kubernetes.io/critical-pod: ''
-        checksum/config: 4ab6ecdecdb1861fe979d96b36d3a0ff085e6b348c36962e8ea3153a8ca26ab5
+        checksum/config: 8f861c2083fe4462d0bf28a34fe7f210f8a2158dc82b79c79d10159004d96fda
     spec:
       nodeSelector:
       
@@ -970,8 +970,8 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: adc29c508fd46e84eec9d28d4927e2b3be0ba37de5cc6baef28f5e0246fafa55
-        checksum/tls-secrets: cb01399d17177d5f6ad912d1844e37c3549ab1079d3f9b00f0c418a525263cc5
+        checksum/config: 573b711378ff1ba09b3222d21cedcb44df6253665b4c5dcb06d2d89ab0952169
+        checksum/tls-secrets: 60dfda7f6014f5bade84be4f512f556e44e033e85548ba8df6c522866215cba6
       labels:
         app.kubernetes.io/name: kuma
         app.kubernetes.io/instance: kuma
diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml
index aa73e1bca..acd03119a 100644
--- a/app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml
+++ b/app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml
@@ -795,8 +795,8 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: adc29c508fd46e84eec9d28d4927e2b3be0ba37de5cc6baef28f5e0246fafa55
-        checksum/tls-secrets: cb01399d17177d5f6ad912d1844e37c3549ab1079d3f9b00f0c418a525263cc5
+        checksum/config: 573b711378ff1ba09b3222d21cedcb44df6253665b4c5dcb06d2d89ab0952169
+        checksum/tls-secrets: 60dfda7f6014f5bade84be4f512f556e44e033e85548ba8df6c522866215cba6
       labels:
         app.kubernetes.io/name: kuma
         app.kubernetes.io/instance: kuma
diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.global.golden.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.global.golden.yaml
index 57261590d..43435da60 100644
--- a/app/kumactl/cmd/install/testdata/install-control-plane.global.golden.yaml
+++ b/app/kumactl/cmd/install/testdata/install-control-plane.global.golden.yaml
@@ -804,8 +804,8 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: adc29c508fd46e84eec9d28d4927e2b3be0ba37de5cc6baef28f5e0246fafa55
-        checksum/tls-secrets: cb01399d17177d5f6ad912d1844e37c3549ab1079d3f9b00f0c418a525263cc5
+        checksum/config: 573b711378ff1ba09b3222d21cedcb44df6253665b4c5dcb06d2d89ab0952169
+        checksum/tls-secrets: 60dfda7f6014f5bade84be4f512f556e44e033e85548ba8df6c522866215cba6
       labels:
         app.kubernetes.io/name: kuma
         app.kubernetes.io/instance: kuma
diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.override-env-vars.golden.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.override-env-vars.golden.yaml
index cd83a1af0..0ca80fa80 100644
--- a/app/kumactl/cmd/install/testdata/install-control-plane.override-env-vars.golden.yaml
+++ b/app/kumactl/cmd/install/testdata/install-control-plane.override-env-vars.golden.yaml
@@ -795,8 +795,8 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: adc29c508fd46e84eec9d28d4927e2b3be0ba37de5cc6baef28f5e0246fafa55
-        checksum/tls-secrets: cb01399d17177d5f6ad912d1844e37c3549ab1079d3f9b00f0c418a525263cc5
+        checksum/config: 573b711378ff1ba09b3222d21cedcb44df6253665b4c5dcb06d2d89ab0952169
+        checksum/tls-secrets: 60dfda7f6014f5bade84be4f512f556e44e033e85548ba8df6c522866215cba6
       labels:
         app.kubernetes.io/name: kuma
         app.kubernetes.io/instance: kuma
diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.overrides.golden.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.overrides.golden.yaml
index 8f7cf4066..5f1efffc2 100644
--- a/app/kumactl/cmd/install/testdata/install-control-plane.overrides.golden.yaml
+++ b/app/kumactl/cmd/install/testdata/install-control-plane.overrides.golden.yaml
@@ -799,8 +799,8 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 45f3cab94024a94e69823d0522ed71904e1faa3c033011d9cbbaff073698a00d
-        checksum/tls-secrets: 318455bec7a180b1de850769df7445b573d9a51e54424796d5a03dd2dd91c501
+        checksum/config: eed671183dfa8486d3a1f98ff5a4810971e49d78aee2305572302eccbaff1564
+        checksum/tls-secrets: 9991d591bc0fb678f6dced493beecfe82ad141ed310744eebe2a1795a7475663
       labels:
         app.kubernetes.io/name: kuma
         app.kubernetes.io/instance: kuma
diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.with-ingress.golden.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.with-ingress.golden.yaml
index 263fb4b08..d2f33c926 100644
--- a/app/kumactl/cmd/install/testdata/install-control-plane.with-ingress.golden.yaml
+++ b/app/kumactl/cmd/install/testdata/install-control-plane.with-ingress.golden.yaml
@@ -824,8 +824,8 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: adc29c508fd46e84eec9d28d4927e2b3be0ba37de5cc6baef28f5e0246fafa55
-        checksum/tls-secrets: cb01399d17177d5f6ad912d1844e37c3549ab1079d3f9b00f0c418a525263cc5
+        checksum/config: 573b711378ff1ba09b3222d21cedcb44df6253665b4c5dcb06d2d89ab0952169
+        checksum/tls-secrets: 60dfda7f6014f5bade84be4f512f556e44e033e85548ba8df6c522866215cba6
       labels:
         app.kubernetes.io/name: kuma
         app.kubernetes.io/instance: kuma
diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.zone.golden.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.zone.golden.yaml
index 4a3f1c9e5..6927d713c 100644
--- a/app/kumactl/cmd/install/testdata/install-control-plane.zone.golden.yaml
+++ b/app/kumactl/cmd/install/testdata/install-control-plane.zone.golden.yaml
@@ -799,8 +799,8 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: adc29c508fd46e84eec9d28d4927e2b3be0ba37de5cc6baef28f5e0246fafa55
-        checksum/tls-secrets: cb01399d17177d5f6ad912d1844e37c3549ab1079d3f9b00f0c418a525263cc5
+        checksum/config: 573b711378ff1ba09b3222d21cedcb44df6253665b4c5dcb06d2d89ab0952169
+        checksum/tls-secrets: 60dfda7f6014f5bade84be4f512f556e44e033e85548ba8df6c522866215cba6
       labels:
         app.kubernetes.io/name: kuma
         app.kubernetes.io/instance: kuma
diff --git a/pkg/xds/generator/testdata/admin/01.envoy-config.golden.yaml b/pkg/xds/generator/testdata/admin/01.envoy-config.golden.yaml
index 9af14d91b..9ca1fbc84 100644
--- a/pkg/xds/generator/testdata/admin/01.envoy-config.golden.yaml
+++ b/pkg/xds/generator/testdata/admin/01.envoy-config.golden.yaml
@@ -79,7 +79,6 @@ resources:
     listenerFilters:
     - name: envoy.filters.listener.tls_inspector
       typedConfig:
-        '@type': type.googleapis.com/google.protobuf.Empty
-        value: {}
+        '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
     name: kuma:envoy:admin
     trafficDirection: INBOUND
diff --git a/pkg/xds/generator/testdata/ingress/01.envoy.golden.yaml b/pkg/xds/generator/testdata/ingress/01.envoy.golden.yaml
index f6ada43ac..03ab403fd 100644
--- a/pkg/xds/generator/testdata/ingress/01.envoy.golden.yaml
+++ b/pkg/xds/generator/testdata/ingress/01.envoy.golden.yaml
@@ -78,7 +78,6 @@ resources:
     listenerFilters:
     - name: envoy.filters.listener.tls_inspector
       typedConfig:
-        '@type': type.googleapis.com/google.protobuf.Empty
-        value: {}
+        '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
     name: inbound:10.0.0.1:10001
     trafficDirection: INBOUND
diff --git a/pkg/xds/generator/testdata/ingress/02.envoy.golden.yaml b/pkg/xds/generator/testdata/ingress/02.envoy.golden.yaml
index 75cacb17b..465dc43ae 100644
--- a/pkg/xds/generator/testdata/ingress/02.envoy.golden.yaml
+++ b/pkg/xds/generator/testdata/ingress/02.envoy.golden.yaml
@@ -11,7 +11,6 @@ resources:
     listenerFilters:
     - name: envoy.filters.listener.tls_inspector
       typedConfig:
-        '@type': type.googleapis.com/google.protobuf.Empty
-        value: {}
+        '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
     name: inbound:10.0.0.1:10001
     trafficDirection: INBOUND
diff --git a/pkg/xds/generator/testdata/ingress/03.envoy.golden.yaml b/pkg/xds/generator/testdata/ingress/03.envoy.golden.yaml
index f26416a54..d51fed170 100644
--- a/pkg/xds/generator/testdata/ingress/03.envoy.golden.yaml
+++ b/pkg/xds/generator/testdata/ingress/03.envoy.golden.yaml
@@ -116,7 +116,6 @@ resources:
     listenerFilters:
     - name: envoy.filters.listener.tls_inspector
       typedConfig:
-        '@type': type.googleapis.com/google.protobuf.Empty
-        value: {}
+        '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
     name: inbound:10.0.0.1:10001
     trafficDirection: INBOUND
diff --git a/pkg/xds/generator/testdata/ingress/04.envoy.golden.yaml b/pkg/xds/generator/testdata/ingress/04.envoy.golden.yaml
index b8bcf60c1..652272481 100644
--- a/pkg/xds/generator/testdata/ingress/04.envoy.golden.yaml
+++ b/pkg/xds/generator/testdata/ingress/04.envoy.golden.yaml
@@ -280,7 +280,6 @@ resources:
     listenerFilters:
     - name: envoy.filters.listener.tls_inspector
       typedConfig:
-        '@type': type.googleapis.com/google.protobuf.Empty
-        value: {}
+        '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
     name: inbound:10.0.0.1:10001
     trafficDirection: INBOUND
diff --git a/pkg/xds/generator/testdata/ingress/05.envoy.golden.yaml b/pkg/xds/generator/testdata/ingress/05.envoy.golden.yaml
index 6ccc8a71b..f58afcf7a 100644
--- a/pkg/xds/generator/testdata/ingress/05.envoy.golden.yaml
+++ b/pkg/xds/generator/testdata/ingress/05.envoy.golden.yaml
@@ -44,7 +44,6 @@ resources:
     listenerFilters:
     - name: envoy.filters.listener.tls_inspector
       typedConfig:
-        '@type': type.googleapis.com/google.protobuf.Empty
-        value: {}
+        '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
     name: inbound:10.0.0.1:10001
     trafficDirection: INBOUND
diff --git a/pkg/xds/generator/testdata/profile-source/1-envoy-config.golden.yaml b/pkg/xds/generator/testdata/profile-source/1-envoy-config.golden.yaml
index 66550afc5..ce471602f 100644
--- a/pkg/xds/generator/testdata/profile-source/1-envoy-config.golden.yaml
+++ b/pkg/xds/generator/testdata/profile-source/1-envoy-config.golden.yaml
@@ -272,8 +272,7 @@ resources:
     listenerFilters:
     - name: envoy.filters.listener.tls_inspector
       typedConfig:
-        '@type': type.googleapis.com/google.protobuf.Empty
-        value: {}
+        '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
     name: kuma:envoy:admin
     trafficDirection: INBOUND
 - name: outbound:127.0.0.1:54321
diff --git a/pkg/xds/generator/testdata/profile-source/2-envoy-config.golden.yaml b/pkg/xds/generator/testdata/profile-source/2-envoy-config.golden.yaml
index 295c6202d..a03ef0125 100644
--- a/pkg/xds/generator/testdata/profile-source/2-envoy-config.golden.yaml
+++ b/pkg/xds/generator/testdata/profile-source/2-envoy-config.golden.yaml
@@ -310,8 +310,7 @@ resources:
     listenerFilters:
     - name: envoy.filters.listener.tls_inspector
       typedConfig:
-        '@type': type.googleapis.com/google.protobuf.Empty
-        value: {}
+        '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
     name: kuma:envoy:admin
     trafficDirection: INBOUND
 - name: outbound:127.0.0.1:54321
diff --git a/pkg/xds/generator/testdata/profile-source/3-envoy-config.golden.yaml b/pkg/xds/generator/testdata/profile-source/3-envoy-config.golden.yaml
index 19c941b3e..c09e9cf7a 100644
--- a/pkg/xds/generator/testdata/profile-source/3-envoy-config.golden.yaml
+++ b/pkg/xds/generator/testdata/profile-source/3-envoy-config.golden.yaml
@@ -306,8 +306,7 @@ resources:
     listenerFilters:
     - name: envoy.filters.listener.tls_inspector
       typedConfig:
-        '@type': type.googleapis.com/google.protobuf.Empty
-        value: {}
+        '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
     name: kuma:envoy:admin
     trafficDirection: INBOUND
 - name: kuma:metrics:prometheus
diff --git a/pkg/xds/generator/testdata/profile-source/4-envoy-config.golden.yaml b/pkg/xds/generator/testdata/profile-source/4-envoy-config.golden.yaml
index 921a8e727..f27e6f28d 100644
--- a/pkg/xds/generator/testdata/profile-source/4-envoy-config.golden.yaml
+++ b/pkg/xds/generator/testdata/profile-source/4-envoy-config.golden.yaml
@@ -344,8 +344,7 @@ resources:
     listenerFilters:
     - name: envoy.filters.listener.tls_inspector
       typedConfig:
-        '@type': type.googleapis.com/google.protobuf.Empty
-        value: {}
+        '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
     name: kuma:envoy:admin
     trafficDirection: INBOUND
 - name: kuma:metrics:prometheus