From 950dde6adea9802e54b0dbf8cc8d5088a46783b5 Mon Sep 17 00:00:00 2001 From: Kebe Date: Wed, 20 Nov 2024 16:32:22 +0800 Subject: [PATCH] fix: remove container's ports field (#4714) Signed-off-by: Kebe --- .../kubernetes/proxy/resource.go | 21 ------------------- .../testdata/daemonsets/component-level.yaml | 6 ------ .../proxy/testdata/daemonsets/custom.yaml | 6 ------ .../testdata/daemonsets/default-env.yaml | 6 ------ .../proxy/testdata/daemonsets/default.yaml | 6 ------ .../daemonsets/disable-prometheus.yaml | 7 ------- .../testdata/daemonsets/extension-env.yaml | 6 ------ .../override-labels-and-annotations.yaml | 6 ------ .../testdata/daemonsets/patch-daemonset.yaml | 6 ------ .../testdata/daemonsets/shutdown-manager.yaml | 6 ------ .../proxy/testdata/daemonsets/volumes.yaml | 6 ------ .../testdata/daemonsets/with-annotations.yaml | 6 ------ .../testdata/daemonsets/with-concurrency.yaml | 6 ------ .../testdata/daemonsets/with-extra-args.yaml | 6 ------ .../daemonsets/with-image-pull-secrets.yaml | 6 ------ .../proxy/testdata/daemonsets/with-name.yaml | 6 ------ .../daemonsets/with-node-selector.yaml | 6 ------ .../with-topology-spread-constraints.yaml | 6 ------ .../proxy/testdata/deployments/bootstrap.yaml | 6 ------ .../testdata/deployments/component-level.yaml | 6 ------ .../proxy/testdata/deployments/custom.yaml | 6 ------ .../custom_with_initcontainers.yaml | 6 ------ .../testdata/deployments/default-env.yaml | 6 ------ .../proxy/testdata/deployments/default.yaml | 6 ------ .../deployments/disable-prometheus.yaml | 7 ------- .../testdata/deployments/extension-env.yaml | 6 ------ .../override-labels-and-annotations.yaml | 6 ------ .../deployments/patch-deployment.yaml | 6 ------ .../deployments/shutdown-manager.yaml | 6 ------ .../proxy/testdata/deployments/volumes.yaml | 6 ------ .../deployments/with-annotations.yaml | 6 ------ .../deployments/with-concurrency.yaml | 6 ------ .../deployments/with-empty-memory-limits.yaml | 6 ------ .../testdata/deployments/with-extra-args.yaml | 6 ------ .../deployments/with-image-pull-secrets.yaml | 6 ------ .../proxy/testdata/deployments/with-name.yaml | 6 ------ .../deployments/with-node-selector.yaml | 6 ------ .../with-topology-spread-constraints.yaml | 6 ------ release-notes/current.yaml | 2 +- 39 files changed, 1 insertion(+), 246 deletions(-) diff --git a/internal/infrastructure/kubernetes/proxy/resource.go b/internal/infrastructure/kubernetes/proxy/resource.go index aa5a4d64e70..55b3cb10623 100644 --- a/internal/infrastructure/kubernetes/proxy/resource.go +++ b/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", diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/component-level.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/component-level.yaml index d68b1e56076..5b0f132f0b9 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/component-level.yaml +++ b/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 diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml index b3472d7ce4a..c776209328c 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml +++ b/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 diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml index 329cb6fcfdb..0b19c488769 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml +++ b/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 diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml index 7fd747bfc54..56a589683bd 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml +++ b/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 diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml index 8de53f5399b..2e0d28b8ae0 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml +++ b/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: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml index ae4f11bf6a4..300ad8663de 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml +++ b/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 diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml index fd9dad594d2..9bd9262b00f 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml +++ b/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 diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml index 44303a333ff..9e2901ea793 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml +++ b/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 diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml index f656e51276b..ee53271eedb 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml +++ b/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 diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml index 268a27505a6..31900415e4e 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.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 diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml index de2cfc52cb5..478248125c1 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml @@ -238,12 +238,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 diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-concurrency.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-concurrency.yaml index 35135058572..409d1ee542d 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-concurrency.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-concurrency.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 diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-extra-args.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-extra-args.yaml index bd684b6f4d5..abcf5df5843 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-extra-args.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-extra-args.yaml @@ -235,12 +235,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 diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-image-pull-secrets.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-image-pull-secrets.yaml index 924d99cee9f..63f4b88837b 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-image-pull-secrets.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-image-pull-secrets.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 diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.yaml index 0f6bb5dcb83..00f4cde053f 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.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 diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-node-selector.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-node-selector.yaml index 69797a95a41..338aee23c5d 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-node-selector.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-node-selector.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 diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-topology-spread-constraints.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-topology-spread-constraints.yaml index b8cf4d12a6c..65d61d1f79d 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-topology-spread-constraints.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-topology-spread-constraints.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 diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/bootstrap.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/bootstrap.yaml index 9cb872f552a..b9d6973e3e5 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/bootstrap.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/bootstrap.yaml @@ -69,12 +69,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 diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/component-level.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/component-level.yaml index 80fa00394ae..30172b63ce8 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/component-level.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/component-level.yaml @@ -70,12 +70,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 diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml index dff786a3515..a319317f707 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml @@ -254,12 +254,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 diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml index 65079b2316e..8d2203c31bb 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml @@ -254,12 +254,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 diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml index 88371d81d1f..b028a291e74 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml @@ -253,12 +253,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 diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml index 57a62e569b5..2dd512c5fcb 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml @@ -237,12 +237,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 diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml index e575a3f3111..e2afb845d04 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml @@ -210,13 +210,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: diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml index 9b84c2b4177..2c6bb786992 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml @@ -257,12 +257,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 diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-labels-and-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-labels-and-annotations.yaml index 6300b906552..cda0dd531da 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-labels-and-annotations.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/override-labels-and-annotations.yaml @@ -246,12 +246,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 diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml index 269909aec48..97c5760f631 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml @@ -237,12 +237,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 diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml index 5774c9dc1d2..81c7fad6ea3 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml @@ -237,12 +237,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 diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml index 9f6f50940c8..a1df598b9fe 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml @@ -257,12 +257,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 diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml index 3924adc4869..e21f0f78ffa 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-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 diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-concurrency.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-concurrency.yaml index 2086f2297a9..16df5efe6a3 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-concurrency.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-concurrency.yaml @@ -70,12 +70,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 diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-empty-memory-limits.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-empty-memory-limits.yaml index ce6f8b7b5de..c2db49a1246 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-empty-memory-limits.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-empty-memory-limits.yaml @@ -237,12 +237,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 diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml index bc0a7e23a5a..402614eb808 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml @@ -239,12 +239,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 diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-image-pull-secrets.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-image-pull-secrets.yaml index 360253c560e..5eb37e92d77 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-image-pull-secrets.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-image-pull-secrets.yaml @@ -237,12 +237,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 diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml index 52ea316c857..5e6bbd62cb7 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml @@ -237,12 +237,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 diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml index 6a8cfb126be..55137dfe205 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml @@ -237,12 +237,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 diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-topology-spread-constraints.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-topology-spread-constraints.yaml index 3bdf275ce09..adc7784549e 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-topology-spread-constraints.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-topology-spread-constraints.yaml @@ -237,12 +237,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 diff --git a/release-notes/current.yaml b/release-notes/current.yaml index 7ede985b9d7..dc452458a21 100644 --- a/release-notes/current.yaml +++ b/release-notes/current.yaml @@ -2,7 +2,7 @@ date: Pending # Changes that are expected to cause an incompatibility with previous versions, such as deletions or modifications to existing APIs. breaking changes: | - Add a breaking change here + The Container `ports` field of the gateway instance has been removed, which will cause the gateway Pod to be rebuilt when upgrading the version. # Updates addressing vulnerabilities, security flaws, or compliance requirements. security updates: |