remove empty tls

Signed-off-by: zirain <zirain2009@gmail.com>
envoyproxy · May 13, 2024 · 9084108 · 9084108
1 parent 115fdb1
commit 9084108
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 14 deletions.
diff --git a/internal/gatewayapi/route.go b/internal/gatewayapi/route.go
@@ -1064,9 +1064,13 @@ func (t *Translator) processTCPRouteParentRefs(tcpRoute *TCPRouteContext, resour
 			accepted = true
 			irKey := t.getIRKey(listener.gateway)
 
-			tls := ir.TLS{
-				Terminate: irTLSConfigs(listener.tlsSecrets),
+			var tls *ir.TLS
+			if len(listener.tlsSecrets) > 0 {
+				tls = &ir.TLS{
+					Terminate: irTLSConfigs(listener.tlsSecrets),
+				}
 			}
+
 			if listener.Hostname != nil {
 				tls.TLSInspectorConfig = &ir.TLSInspectorConfig{
 					SNIs: []string{string(*listener.Hostname)},
@@ -1081,7 +1085,7 @@ func (t *Translator) processTCPRouteParentRefs(tcpRoute *TCPRouteContext, resour
 						Name:     irRouteDestinationName(tcpRoute, -1 /*rule index*/),
 						Settings: destSettings,
 					},
-					TLS: &tls,
+					TLS: tls,
 				}
 				irListener.Routes = append(irListener.Routes, irRoute)
 

diff --git a/...gatewayapi/testdata/backendtrafficpolicy-with-tcp-udp-listeners-apply-on-gateway.out.yaml b/...gatewayapi/testdata/backendtrafficpolicy-with-tcp-udp-listeners-apply-on-gateway.out.yaml
@@ -291,7 +291,6 @@ xdsIR:
             maxConnectionDuration: 17s
           tcp:
             connectTimeout: 15s
-        tls: {}
     udp:
     - address: 0.0.0.0
       destination:

diff --git a/...l/gatewayapi/testdata/backendtrafficpolicy-with-tcp-udp-listeners-apply-on-route.out.yaml b/...l/gatewayapi/testdata/backendtrafficpolicy-with-tcp-udp-listeners-apply-on-route.out.yaml
@@ -364,7 +364,6 @@ xdsIR:
             maxConnectionDuration: 17s
           tcp:
             connectTimeout: 15s
-        tls: {}
     udp:
     - address: 0.0.0.0
       destination:

diff --git a/...ewayapi/testdata/gateway-with-listener-with-tcproute-with-mismatch-port-protocol.out.yaml b/...ewayapi/testdata/gateway-with-listener-with-tcproute-with-mismatch-port-protocol.out.yaml
@@ -100,4 +100,3 @@ xdsIR:
           settings:
           - weight: 1
         name: tcproute/default/tcproute-1
-        tls: {}
diff --git a/...l/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-backends.out.yaml b/...l/gatewayapi/testdata/gateway-with-listener-with-tcproute-with-multiple-backends.out.yaml
@@ -115,4 +115,3 @@ xdsIR:
             protocol: TCP
             weight: 50
         name: tcproute/default/tcproute-1
-        tls: {}
diff --git a/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-tcproutes.out.yaml b/internal/gatewayapi/testdata/gateway-with-single-listener-with-multiple-tcproutes.out.yaml
@@ -136,4 +136,3 @@ xdsIR:
             protocol: TCP
             weight: 1
         name: tcproute/default/tcproute-1
-        tls: {}
diff --git a/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-tcp-or-tls-port.out.yaml b/internal/gatewayapi/testdata/gateway-with-two-listeners-on-same-tcp-or-tls-port.out.yaml
@@ -129,4 +129,3 @@ xdsIR:
             protocol: TCP
             weight: 1
         name: tcproute/default/tcproute-1
-        tls: {}
diff --git a/.../gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-tcp-protocol.out.yaml b/.../gatewayapi/testdata/gateway-with-two-listeners-with-same-port-http-tcp-protocol.out.yaml
@@ -204,4 +204,3 @@ xdsIR:
             protocol: TCP
             weight: 1
         name: tcproute/default/tcproute-1
-        tls: {}
diff --git a/...l/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-with-sectionname.out.yaml b/...l/gatewayapi/testdata/gateway-with-two-listeners-with-tcproutes-with-sectionname.out.yaml
@@ -174,7 +174,6 @@ xdsIR:
             protocol: TCP
             weight: 1
         name: tcproute/default/tcproute-1
-        tls: {}
     - address: 0.0.0.0
       name: envoy-gateway/gateway-1/tcp2
       port: 10163
@@ -189,4 +188,3 @@ xdsIR:
             protocol: TCP
             weight: 1
         name: tcproute/default/tcproute-2
-        tls: {}
diff --git a/...atewayapi/testdata/gateway-with-two-listeners-with-tcproutes-without-sectionname.out.yaml b/...atewayapi/testdata/gateway-with-two-listeners-with-tcproutes-without-sectionname.out.yaml
@@ -170,7 +170,6 @@ xdsIR:
             protocol: TCP
             weight: 1
         name: tcproute/default/tcproute-1
-        tls: {}
     - address: 0.0.0.0
       name: envoy-gateway/gateway-1/tcp2
       port: 10162
@@ -185,4 +184,3 @@ xdsIR:
             protocol: TCP
             weight: 1
         name: tcproute/default/tcproute-1
-        tls: {}