fix: remove container's ports field (envoyproxy#4714)

Signed-off-by: Kebe <[email protected]>

Author: kebe7jun

internal/infrastructure/kubernetes/proxy/resource.go

@@ -89,27 +89,6 @@ func expectedProxyContainers(infra *ir.ProxyInfra,
 	// Define slice to hold container ports
 	var ports []corev1.ContainerPort
 
-	// Iterate over listeners and ports to get container ports
-	for _, listener := range infra.Listeners {
-		for _, p := range listener.Ports {
-			var protocol corev1.Protocol
-			switch p.Protocol {
-			case ir.HTTPProtocolType, ir.HTTPSProtocolType, ir.TLSProtocolType, ir.TCPProtocolType:
-				protocol = corev1.ProtocolTCP
-			case ir.UDPProtocolType:
-				protocol = corev1.ProtocolUDP
-			default:
-				return nil, fmt.Errorf("invalid protocol %q", p.Protocol)
-			}
-			port := corev1.ContainerPort{
-				Name:          p.Name,
-				ContainerPort: p.ContainerPort,
-				Protocol:      protocol,
-			}
-			ports = append(ports, port)
-		}
-	}
-
 	if enablePrometheus(infra) {
 		ports = append(ports, corev1.ContainerPort{
 			Name:          "metrics",

internal/infrastructure/kubernetes/proxy/testdata/daemonsets/component-level.yaml

@@ -66,12 +66,6 @@ spec:
               scheme: HTTP
         name: envoy
         ports:
-        - containerPort: 8080
-          name: EnvoyHTTPPort
-          protocol: TCP
-        - containerPort: 8443
-          name: EnvoyHTTPSPort
-          protocol: TCP
         - containerPort: 19001
           name: metrics
           protocol: TCP

internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml

@@ -249,12 +249,6 @@ spec:
               scheme: HTTP
         name: envoy
         ports:
-        - containerPort: 8080
-          name: EnvoyHTTPPort
-          protocol: TCP
-        - containerPort: 8443
-          name: EnvoyHTTPSPort
-          protocol: TCP
         - containerPort: 19001
           name: metrics
           protocol: TCP

internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml

@@ -248,12 +248,6 @@ spec:
               scheme: HTTP
         name: envoy
         ports:
-        - containerPort: 8080
-          name: EnvoyHTTPPort
-          protocol: TCP
-        - containerPort: 8443
-          name: EnvoyHTTPSPort
-          protocol: TCP
         - containerPort: 19001
           name: metrics
           protocol: TCP

internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml

@@ -233,12 +233,6 @@ spec:
               scheme: HTTP
         name: envoy
         ports:
-        - containerPort: 8080
-          name: EnvoyHTTPPort
-          protocol: TCP
-        - containerPort: 8443
-          name: EnvoyHTTPSPort
-          protocol: TCP
         - containerPort: 19001
           name: metrics
           protocol: TCP

internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml

@@ -206,13 +206,6 @@ spec:
               port: 19002
               scheme: HTTP
         name: envoy
-        ports:
-        - containerPort: 8080
-          name: EnvoyHTTPPort
-          protocol: TCP
-        - containerPort: 8443
-          name: EnvoyHTTPSPort
-          protocol: TCP
         readinessProbe:
           failureThreshold: 1
           httpGet:

internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml

@@ -252,12 +252,6 @@ spec:
               scheme: HTTP
         name: envoy
         ports:
-        - containerPort: 8080
-          name: EnvoyHTTPPort
-          protocol: TCP
-        - containerPort: 8443
-          name: EnvoyHTTPSPort
-          protocol: TCP
         - containerPort: 19001
           name: metrics
           protocol: TCP

internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml

@@ -242,12 +242,6 @@ spec:
               scheme: HTTP
         name: envoy
         ports:
-        - containerPort: 8080
-          name: EnvoyHTTPPort
-          protocol: TCP
-        - containerPort: 8443
-          name: EnvoyHTTPSPort
-          protocol: TCP
         - containerPort: 19001
           name: metrics
           protocol: TCP

internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml

@@ -233,12 +233,6 @@ spec:
               scheme: HTTP
         name: envoy
         ports:
-        - containerPort: 8080
-          name: EnvoyHTTPPort
-          protocol: TCP
-        - containerPort: 8443
-          name: EnvoyHTTPSPort
-          protocol: TCP
         - containerPort: 19001
           name: metrics
           protocol: TCP

internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml

@@ -233,12 +233,6 @@ spec:
               scheme: HTTP
         name: envoy
         ports:
-        - containerPort: 8080
-          name: EnvoyHTTPPort
-          protocol: TCP
-        - containerPort: 8443
-          name: EnvoyHTTPSPort
-          protocol: TCP
         - containerPort: 19001
           name: metrics
           protocol: TCP