From e285b98d7355bf1989fc6274faaa2b938da4bb2c Mon Sep 17 00:00:00 2001 From: zirain Date: Mon, 30 Dec 2024 12:32:44 +0800 Subject: [PATCH] Revert "feat(default-memory-limits): set default memory limits (#4960)" This reverts commit fddcf9bdde9d3e6f41aaaaa5665971769179ba04. Signed-off-by: zirain --- api/v1alpha1/envoyproxy_helpers.go | 3 --- api/v1alpha1/kubernetes_helpers.go | 3 --- api/v1alpha1/shared_types.go | 4 ---- .../testdata/daemonsets/component-level.yaml | 4 ---- .../proxy/testdata/daemonsets/custom.yaml | 2 -- .../testdata/daemonsets/default-env.yaml | 2 -- .../proxy/testdata/daemonsets/default.yaml | 19 ------------------- .../daemonsets/disable-prometheus.yaml | 19 ------------------- .../testdata/daemonsets/extension-env.yaml | 2 -- .../override-labels-and-annotations.yaml | 19 ------------------- .../testdata/daemonsets/patch-daemonset.yaml | 19 ------------------- .../testdata/daemonsets/shutdown-manager.yaml | 17 ----------------- .../proxy/testdata/daemonsets/volumes.yaml | 2 -- .../testdata/daemonsets/with-annotations.yaml | 19 ------------------- .../testdata/daemonsets/with-concurrency.yaml | 4 ---- .../testdata/daemonsets/with-extra-args.yaml | 19 ------------------- .../daemonsets/with-image-pull-secrets.yaml | 19 ------------------- .../proxy/testdata/daemonsets/with-name.yaml | 19 ------------------- .../daemonsets/with-node-selector.yaml | 19 ------------------- .../with-topology-spread-constraints.yaml | 19 ------------------- .../proxy/testdata/deployments/bootstrap.yaml | 4 ---- .../testdata/deployments/component-level.yaml | 4 ---- .../proxy/testdata/deployments/custom.yaml | 2 -- .../custom_with_initcontainers.yaml | 2 -- .../testdata/deployments/default-env.yaml | 2 -- .../proxy/testdata/deployments/default.yaml | 19 ------------------- .../deployments/disable-prometheus.yaml | 19 ------------------- .../testdata/deployments/dual-stack.yaml | 19 ------------------- .../testdata/deployments/extension-env.yaml | 2 -- .../proxy/testdata/deployments/ipv6.yaml | 19 ------------------- .../override-labels-and-annotations.yaml | 19 ------------------- .../deployments/patch-deployment.yaml | 19 ------------------- .../deployments/shutdown-manager.yaml | 17 ----------------- .../proxy/testdata/deployments/volumes.yaml | 2 -- .../deployments/with-annotations.yaml | 19 ------------------- .../deployments/with-concurrency.yaml | 4 ---- .../deployments/with-empty-memory-limits.yaml | 2 -- .../testdata/deployments/with-extra-args.yaml | 19 ------------------- .../deployments/with-image-pull-secrets.yaml | 19 ------------------- .../proxy/testdata/deployments/with-name.yaml | 19 ------------------- .../deployments/with-node-selector.yaml | 19 ------------------- .../with-topology-spread-constraints.yaml | 19 ------------------- .../testdata/deployments/default.yaml | 2 -- .../deployments/disable-prometheus.yaml | 2 -- .../deployments/enable-tracing-custom.yaml | 2 -- .../testdata/deployments/enable-tracing.yaml | 2 -- .../deployments/merge-annotations.yaml | 2 -- .../testdata/deployments/merge-labels.yaml | 2 -- .../deployments/patch-deployment.yaml | 2 -- .../deployments/with-node-selector.yaml | 2 -- .../with-topology-spread-constraints.yaml | 2 -- 51 files changed, 520 deletions(-) diff --git a/api/v1alpha1/envoyproxy_helpers.go b/api/v1alpha1/envoyproxy_helpers.go index 0cdd1b7e2ba..ec69147e653 100644 --- a/api/v1alpha1/envoyproxy_helpers.go +++ b/api/v1alpha1/envoyproxy_helpers.go @@ -155,9 +155,6 @@ func DefaultShutdownManagerContainerResourceRequirements() *corev1.ResourceRequi corev1.ResourceCPU: resource.MustParse(DefaultShutdownManagerCPUResourceRequests), corev1.ResourceMemory: resource.MustParse(DefaultShutdownManagerMemoryResourceRequests), }, - Limits: corev1.ResourceList{ - corev1.ResourceMemory: resource.MustParse(DefaultShutdownManagerMemoryResourceLimits), - }, } } diff --git a/api/v1alpha1/kubernetes_helpers.go b/api/v1alpha1/kubernetes_helpers.go index 2622a41bf5d..6dd6b5fbfcc 100644 --- a/api/v1alpha1/kubernetes_helpers.go +++ b/api/v1alpha1/kubernetes_helpers.go @@ -76,9 +76,6 @@ func DefaultResourceRequirements() *corev1.ResourceRequirements { corev1.ResourceCPU: resource.MustParse(DefaultDeploymentCPUResourceRequests), corev1.ResourceMemory: resource.MustParse(DefaultDeploymentMemoryResourceRequests), }, - Limits: corev1.ResourceList{ - corev1.ResourceMemory: resource.MustParse(DefaultDeploymentMemoryResourceLimits), - }, } } diff --git a/api/v1alpha1/shared_types.go b/api/v1alpha1/shared_types.go index 456a9e63c75..036054dc47e 100644 --- a/api/v1alpha1/shared_types.go +++ b/api/v1alpha1/shared_types.go @@ -21,16 +21,12 @@ const ( DefaultDeploymentCPUResourceRequests = "100m" // DefaultDeploymentMemoryResourceRequests for deployment memory resource DefaultDeploymentMemoryResourceRequests = "512Mi" - // DefaultDeploymentMemoryResourceLimits for deployment memory resource limits - DefaultDeploymentMemoryResourceLimits = "512Mi" // DefaultEnvoyProxyImage is the default image used by envoyproxy DefaultEnvoyProxyImage = "docker.io/envoyproxy/envoy:distroless-dev" // DefaultShutdownManagerCPUResourceRequests for shutdown manager cpu resource DefaultShutdownManagerCPUResourceRequests = "10m" // DefaultShutdownManagerMemoryResourceRequests for shutdown manager memory resource DefaultShutdownManagerMemoryResourceRequests = "32Mi" - // DefaultShutdownManagerMemoryResourceLimits for shutdown manager memory resource limits - DefaultShutdownManagerMemoryResourceLimits = "32Mi" // DefaultShutdownManagerImage is the default image used for the shutdown manager. DefaultShutdownManagerImage = "docker.io/envoyproxy/gateway-dev:latest" // DefaultRateLimitImage is the default image used by ratelimit. diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/component-level.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/component-level.yaml index 05420204975..5b0f132f0b9 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/component-level.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/component-level.yaml @@ -79,8 +79,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 512Mi requests: cpu: 100m memory: 512Mi @@ -157,8 +155,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 32Mi requests: cpu: 10m memory: 32Mi diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml index 4ac04f9bfb3..87727e4be1c 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/custom.yaml @@ -332,8 +332,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 32Mi requests: cpu: 10m memory: 32Mi diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml index 6ba33e1972a..7827b9eccc7 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default-env.yaml @@ -331,8 +331,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 32Mi requests: cpu: 10m memory: 32Mi diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml index 130d50d7176..95f186cb8a4 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/default.yaml @@ -206,21 +206,6 @@ spec: typed_config: "@type": type.googleapis.com/envoy.extensions.resource_monitors.downstream_connections.v3.DownstreamConnectionsConfig max_active_downstream_connections: 50000 - - name: "envoy.resource_monitors.fixed_heap" - typed_config: - "@type": type.googleapis.com/envoy.extensions.resource_monitors.fixed_heap.v3.FixedHeapConfig - max_heap_size_bytes: 429496729 - actions: - - name: "envoy.overload_actions.shrink_heap" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.95 - - name: "envoy.overload_actions.stop_accepting_requests" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.98 - --log-level warn - --cpuset-threads - --drain-strategy immediate @@ -261,8 +246,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 512Mi requests: cpu: 100m memory: 512Mi @@ -339,8 +322,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 32Mi requests: cpu: 10m memory: 32Mi diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml index 8a7b0ec607b..54e8c6d53f4 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/disable-prometheus.yaml @@ -180,21 +180,6 @@ spec: typed_config: "@type": type.googleapis.com/envoy.extensions.resource_monitors.downstream_connections.v3.DownstreamConnectionsConfig max_active_downstream_connections: 50000 - - name: "envoy.resource_monitors.fixed_heap" - typed_config: - "@type": type.googleapis.com/envoy.extensions.resource_monitors.fixed_heap.v3.FixedHeapConfig - max_heap_size_bytes: 429496729 - actions: - - name: "envoy.overload_actions.shrink_heap" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.95 - - name: "envoy.overload_actions.stop_accepting_requests" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.98 - --log-level warn - --cpuset-threads - --drain-strategy immediate @@ -231,8 +216,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 512Mi requests: cpu: 100m memory: 512Mi @@ -309,8 +292,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 32Mi requests: cpu: 10m memory: 32Mi diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml index 211a7340be4..b75e8ec22ad 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/extension-env.yaml @@ -335,8 +335,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 32Mi requests: cpu: 10m memory: 32Mi 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 6acc46d239e..1d033190e83 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 @@ -215,21 +215,6 @@ spec: typed_config: "@type": type.googleapis.com/envoy.extensions.resource_monitors.downstream_connections.v3.DownstreamConnectionsConfig max_active_downstream_connections: 50000 - - name: "envoy.resource_monitors.fixed_heap" - typed_config: - "@type": type.googleapis.com/envoy.extensions.resource_monitors.fixed_heap.v3.FixedHeapConfig - max_heap_size_bytes: 429496729 - actions: - - name: "envoy.overload_actions.shrink_heap" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.95 - - name: "envoy.overload_actions.stop_accepting_requests" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.98 - --log-level warn - --cpuset-threads - --drain-strategy immediate @@ -270,8 +255,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 512Mi requests: cpu: 100m memory: 512Mi @@ -348,8 +331,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 32Mi requests: cpu: 10m memory: 32Mi diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml index b0a15502a80..0e9f6e598c7 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/patch-daemonset.yaml @@ -206,21 +206,6 @@ spec: typed_config: "@type": type.googleapis.com/envoy.extensions.resource_monitors.downstream_connections.v3.DownstreamConnectionsConfig max_active_downstream_connections: 50000 - - name: "envoy.resource_monitors.fixed_heap" - typed_config: - "@type": type.googleapis.com/envoy.extensions.resource_monitors.fixed_heap.v3.FixedHeapConfig - max_heap_size_bytes: 429496729 - actions: - - name: "envoy.overload_actions.shrink_heap" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.95 - - name: "envoy.overload_actions.stop_accepting_requests" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.98 - --log-level warn - --cpuset-threads - --drain-strategy immediate @@ -261,8 +246,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 512Mi requests: cpu: 100m memory: 512Mi @@ -339,8 +322,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 32Mi requests: cpu: 10m memory: 32Mi diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml index 508ab81ac74..99647fce436 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/shutdown-manager.yaml @@ -206,21 +206,6 @@ spec: typed_config: "@type": type.googleapis.com/envoy.extensions.resource_monitors.downstream_connections.v3.DownstreamConnectionsConfig max_active_downstream_connections: 50000 - - name: "envoy.resource_monitors.fixed_heap" - typed_config: - "@type": type.googleapis.com/envoy.extensions.resource_monitors.fixed_heap.v3.FixedHeapConfig - max_heap_size_bytes: 429496729 - actions: - - name: "envoy.overload_actions.shrink_heap" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.95 - - name: "envoy.overload_actions.stop_accepting_requests" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.98 - --log-level warn - --cpuset-threads - --drain-strategy immediate @@ -261,8 +246,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 512Mi requests: cpu: 100m memory: 512Mi diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml index 33b1e7db666..53ec48429c1 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/volumes.yaml @@ -335,8 +335,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 32Mi requests: cpu: 10m memory: 32Mi diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml index 9f388e2cbd1..b9beaa023ff 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-annotations.yaml @@ -211,21 +211,6 @@ spec: typed_config: "@type": type.googleapis.com/envoy.extensions.resource_monitors.downstream_connections.v3.DownstreamConnectionsConfig max_active_downstream_connections: 50000 - - name: "envoy.resource_monitors.fixed_heap" - typed_config: - "@type": type.googleapis.com/envoy.extensions.resource_monitors.fixed_heap.v3.FixedHeapConfig - max_heap_size_bytes: 429496729 - actions: - - name: "envoy.overload_actions.shrink_heap" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.95 - - name: "envoy.overload_actions.stop_accepting_requests" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.98 - --log-level warn - --cpuset-threads - --drain-strategy immediate @@ -266,8 +251,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 512Mi requests: cpu: 100m memory: 512Mi @@ -344,8 +327,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 32Mi requests: cpu: 10m memory: 32Mi diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-concurrency.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-concurrency.yaml index bd44e449099..409d1ee542d 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-concurrency.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-concurrency.yaml @@ -79,8 +79,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 512Mi requests: cpu: 100m memory: 512Mi @@ -157,8 +155,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 32Mi requests: cpu: 10m memory: 32Mi 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 02ba627d950..a9616129ff9 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-extra-args.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-extra-args.yaml @@ -206,21 +206,6 @@ spec: typed_config: "@type": type.googleapis.com/envoy.extensions.resource_monitors.downstream_connections.v3.DownstreamConnectionsConfig max_active_downstream_connections: 50000 - - name: "envoy.resource_monitors.fixed_heap" - typed_config: - "@type": type.googleapis.com/envoy.extensions.resource_monitors.fixed_heap.v3.FixedHeapConfig - max_heap_size_bytes: 429496729 - actions: - - name: "envoy.overload_actions.shrink_heap" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.95 - - name: "envoy.overload_actions.stop_accepting_requests" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.98 - --log-level warn - --cpuset-threads - --drain-strategy immediate @@ -263,8 +248,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 512Mi requests: cpu: 100m memory: 512Mi @@ -341,8 +324,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 32Mi requests: cpu: 10m memory: 32Mi 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 d61e7cf3c2b..b3d3c8301e6 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 @@ -206,21 +206,6 @@ spec: typed_config: "@type": type.googleapis.com/envoy.extensions.resource_monitors.downstream_connections.v3.DownstreamConnectionsConfig max_active_downstream_connections: 50000 - - name: "envoy.resource_monitors.fixed_heap" - typed_config: - "@type": type.googleapis.com/envoy.extensions.resource_monitors.fixed_heap.v3.FixedHeapConfig - max_heap_size_bytes: 429496729 - actions: - - name: "envoy.overload_actions.shrink_heap" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.95 - - name: "envoy.overload_actions.stop_accepting_requests" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.98 - --log-level warn - --cpuset-threads - --drain-strategy immediate @@ -261,8 +246,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 512Mi requests: cpu: 100m memory: 512Mi @@ -339,8 +322,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 32Mi requests: cpu: 10m memory: 32Mi diff --git a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.yaml b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.yaml index e674563e6dc..ac554d2f387 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-name.yaml @@ -206,21 +206,6 @@ spec: typed_config: "@type": type.googleapis.com/envoy.extensions.resource_monitors.downstream_connections.v3.DownstreamConnectionsConfig max_active_downstream_connections: 50000 - - name: "envoy.resource_monitors.fixed_heap" - typed_config: - "@type": type.googleapis.com/envoy.extensions.resource_monitors.fixed_heap.v3.FixedHeapConfig - max_heap_size_bytes: 429496729 - actions: - - name: "envoy.overload_actions.shrink_heap" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.95 - - name: "envoy.overload_actions.stop_accepting_requests" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.98 - --log-level warn - --cpuset-threads - --drain-strategy immediate @@ -261,8 +246,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 512Mi requests: cpu: 100m memory: 512Mi @@ -339,8 +322,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 32Mi requests: cpu: 10m memory: 32Mi 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 484dcc4a015..c51e2a86ec3 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-node-selector.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/daemonsets/with-node-selector.yaml @@ -206,21 +206,6 @@ spec: typed_config: "@type": type.googleapis.com/envoy.extensions.resource_monitors.downstream_connections.v3.DownstreamConnectionsConfig max_active_downstream_connections: 50000 - - name: "envoy.resource_monitors.fixed_heap" - typed_config: - "@type": type.googleapis.com/envoy.extensions.resource_monitors.fixed_heap.v3.FixedHeapConfig - max_heap_size_bytes: 429496729 - actions: - - name: "envoy.overload_actions.shrink_heap" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.95 - - name: "envoy.overload_actions.stop_accepting_requests" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.98 - --log-level warn - --cpuset-threads - --drain-strategy immediate @@ -261,8 +246,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 512Mi requests: cpu: 100m memory: 512Mi @@ -339,8 +322,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 32Mi requests: cpu: 10m memory: 32Mi 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 d8931cae1b0..cf8ef7144a5 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 @@ -206,21 +206,6 @@ spec: typed_config: "@type": type.googleapis.com/envoy.extensions.resource_monitors.downstream_connections.v3.DownstreamConnectionsConfig max_active_downstream_connections: 50000 - - name: "envoy.resource_monitors.fixed_heap" - typed_config: - "@type": type.googleapis.com/envoy.extensions.resource_monitors.fixed_heap.v3.FixedHeapConfig - max_heap_size_bytes: 429496729 - actions: - - name: "envoy.overload_actions.shrink_heap" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.95 - - name: "envoy.overload_actions.stop_accepting_requests" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.98 - --log-level warn - --cpuset-threads - --drain-strategy immediate @@ -261,8 +246,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 512Mi requests: cpu: 100m memory: 512Mi @@ -339,8 +322,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 32Mi requests: cpu: 10m memory: 32Mi diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/bootstrap.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/bootstrap.yaml index b8c64d04bda..b9d6973e3e5 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/bootstrap.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/bootstrap.yaml @@ -82,8 +82,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 512Mi requests: cpu: 100m memory: 512Mi @@ -160,8 +158,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 32Mi requests: cpu: 10m memory: 32Mi diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/component-level.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/component-level.yaml index de9284bbaa9..30172b63ce8 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/component-level.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/component-level.yaml @@ -83,8 +83,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 512Mi requests: cpu: 100m memory: 512Mi @@ -161,8 +159,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 32Mi requests: cpu: 10m memory: 32Mi diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml index 996aaa9a25d..a312bb39a61 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml @@ -337,8 +337,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 32Mi requests: cpu: 10m memory: 32Mi 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 f3c8c4a205d..e4518aa9be7 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml @@ -339,8 +339,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 32Mi requests: cpu: 10m memory: 32Mi diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml index 1e32330e462..5d34ac37081 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml @@ -336,8 +336,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 32Mi requests: cpu: 10m memory: 32Mi diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml index e9d04f8d120..d257b62dd62 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml @@ -210,21 +210,6 @@ spec: typed_config: "@type": type.googleapis.com/envoy.extensions.resource_monitors.downstream_connections.v3.DownstreamConnectionsConfig max_active_downstream_connections: 50000 - - name: "envoy.resource_monitors.fixed_heap" - typed_config: - "@type": type.googleapis.com/envoy.extensions.resource_monitors.fixed_heap.v3.FixedHeapConfig - max_heap_size_bytes: 429496729 - actions: - - name: "envoy.overload_actions.shrink_heap" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.95 - - name: "envoy.overload_actions.stop_accepting_requests" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.98 - --log-level warn - --cpuset-threads - --drain-strategy immediate @@ -265,8 +250,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 512Mi requests: cpu: 100m memory: 512Mi @@ -343,8 +326,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 32Mi requests: cpu: 10m memory: 32Mi diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml index 6761d223419..c8a9d5b4240 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml @@ -184,21 +184,6 @@ spec: typed_config: "@type": type.googleapis.com/envoy.extensions.resource_monitors.downstream_connections.v3.DownstreamConnectionsConfig max_active_downstream_connections: 50000 - - name: "envoy.resource_monitors.fixed_heap" - typed_config: - "@type": type.googleapis.com/envoy.extensions.resource_monitors.fixed_heap.v3.FixedHeapConfig - max_heap_size_bytes: 429496729 - actions: - - name: "envoy.overload_actions.shrink_heap" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.95 - - name: "envoy.overload_actions.stop_accepting_requests" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.98 - --log-level warn - --cpuset-threads - --drain-strategy immediate @@ -235,8 +220,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 512Mi requests: cpu: 100m memory: 512Mi @@ -313,8 +296,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 32Mi requests: cpu: 10m memory: 32Mi diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/dual-stack.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/dual-stack.yaml index 289e187e0ec..fe8d8f8ecfe 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/dual-stack.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/dual-stack.yaml @@ -211,21 +211,6 @@ spec: typed_config: "@type": type.googleapis.com/envoy.extensions.resource_monitors.downstream_connections.v3.DownstreamConnectionsConfig max_active_downstream_connections: 50000 - - name: "envoy.resource_monitors.fixed_heap" - typed_config: - "@type": type.googleapis.com/envoy.extensions.resource_monitors.fixed_heap.v3.FixedHeapConfig - max_heap_size_bytes: 429496729 - actions: - - name: "envoy.overload_actions.shrink_heap" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.95 - - name: "envoy.overload_actions.stop_accepting_requests" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.98 - --log-level warn - --cpuset-threads - --drain-strategy immediate @@ -266,8 +251,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 512Mi requests: cpu: 100m memory: 512Mi @@ -344,8 +327,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 32Mi requests: cpu: 10m memory: 32Mi diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml index ba49e423404..232fa80b00f 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml @@ -340,8 +340,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 32Mi requests: cpu: 10m memory: 32Mi diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/ipv6.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/ipv6.yaml index 9480f779d5d..cde8a785717 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/ipv6.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/ipv6.yaml @@ -210,21 +210,6 @@ spec: typed_config: "@type": type.googleapis.com/envoy.extensions.resource_monitors.downstream_connections.v3.DownstreamConnectionsConfig max_active_downstream_connections: 50000 - - name: "envoy.resource_monitors.fixed_heap" - typed_config: - "@type": type.googleapis.com/envoy.extensions.resource_monitors.fixed_heap.v3.FixedHeapConfig - max_heap_size_bytes: 429496729 - actions: - - name: "envoy.overload_actions.shrink_heap" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.95 - - name: "envoy.overload_actions.stop_accepting_requests" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.98 - --log-level warn - --cpuset-threads - --drain-strategy immediate @@ -265,8 +250,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 512Mi requests: cpu: 100m memory: 512Mi @@ -343,8 +326,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 32Mi requests: cpu: 10m memory: 32Mi 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 4405b082d21..3777fa8a88e 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 @@ -219,21 +219,6 @@ spec: typed_config: "@type": type.googleapis.com/envoy.extensions.resource_monitors.downstream_connections.v3.DownstreamConnectionsConfig max_active_downstream_connections: 50000 - - name: "envoy.resource_monitors.fixed_heap" - typed_config: - "@type": type.googleapis.com/envoy.extensions.resource_monitors.fixed_heap.v3.FixedHeapConfig - max_heap_size_bytes: 429496729 - actions: - - name: "envoy.overload_actions.shrink_heap" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.95 - - name: "envoy.overload_actions.stop_accepting_requests" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.98 - --log-level warn - --cpuset-threads - --drain-strategy immediate @@ -274,8 +259,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 512Mi requests: cpu: 100m memory: 512Mi @@ -352,8 +335,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 32Mi requests: cpu: 10m memory: 32Mi diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml index 7a5c1d99468..e751dfc8cb1 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml @@ -210,21 +210,6 @@ spec: typed_config: "@type": type.googleapis.com/envoy.extensions.resource_monitors.downstream_connections.v3.DownstreamConnectionsConfig max_active_downstream_connections: 50000 - - name: "envoy.resource_monitors.fixed_heap" - typed_config: - "@type": type.googleapis.com/envoy.extensions.resource_monitors.fixed_heap.v3.FixedHeapConfig - max_heap_size_bytes: 429496729 - actions: - - name: "envoy.overload_actions.shrink_heap" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.95 - - name: "envoy.overload_actions.stop_accepting_requests" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.98 - --log-level warn - --cpuset-threads - --drain-strategy immediate @@ -265,8 +250,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 512Mi requests: cpu: 100m memory: 512Mi @@ -343,8 +326,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 32Mi requests: cpu: 10m memory: 32Mi diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml index 25d0faec930..53473970538 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml @@ -210,21 +210,6 @@ spec: typed_config: "@type": type.googleapis.com/envoy.extensions.resource_monitors.downstream_connections.v3.DownstreamConnectionsConfig max_active_downstream_connections: 50000 - - name: "envoy.resource_monitors.fixed_heap" - typed_config: - "@type": type.googleapis.com/envoy.extensions.resource_monitors.fixed_heap.v3.FixedHeapConfig - max_heap_size_bytes: 429496729 - actions: - - name: "envoy.overload_actions.shrink_heap" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.95 - - name: "envoy.overload_actions.stop_accepting_requests" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.98 - --log-level warn - --cpuset-threads - --drain-strategy immediate @@ -265,8 +250,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 512Mi requests: cpu: 100m memory: 512Mi diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml index 4d15c16f2b5..282e038d84b 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml @@ -340,8 +340,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 32Mi requests: cpu: 10m memory: 32Mi diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml index b5858b70fe8..02c028e82e4 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml @@ -215,21 +215,6 @@ spec: typed_config: "@type": type.googleapis.com/envoy.extensions.resource_monitors.downstream_connections.v3.DownstreamConnectionsConfig max_active_downstream_connections: 50000 - - name: "envoy.resource_monitors.fixed_heap" - typed_config: - "@type": type.googleapis.com/envoy.extensions.resource_monitors.fixed_heap.v3.FixedHeapConfig - max_heap_size_bytes: 429496729 - actions: - - name: "envoy.overload_actions.shrink_heap" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.95 - - name: "envoy.overload_actions.stop_accepting_requests" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.98 - --log-level warn - --cpuset-threads - --drain-strategy immediate @@ -270,8 +255,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 512Mi requests: cpu: 100m memory: 512Mi @@ -348,8 +331,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 32Mi requests: cpu: 10m memory: 32Mi diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-concurrency.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-concurrency.yaml index 28696ee8bbb..16df5efe6a3 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-concurrency.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-concurrency.yaml @@ -83,8 +83,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 512Mi requests: cpu: 100m memory: 512Mi @@ -161,8 +159,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 32Mi requests: cpu: 10m memory: 32Mi 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 028d4dc5518..b3275c38bcc 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 @@ -325,8 +325,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 32Mi requests: cpu: 10m memory: 32Mi 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 ee8f986dd06..3a8ed4422e2 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml @@ -210,21 +210,6 @@ spec: typed_config: "@type": type.googleapis.com/envoy.extensions.resource_monitors.downstream_connections.v3.DownstreamConnectionsConfig max_active_downstream_connections: 50000 - - name: "envoy.resource_monitors.fixed_heap" - typed_config: - "@type": type.googleapis.com/envoy.extensions.resource_monitors.fixed_heap.v3.FixedHeapConfig - max_heap_size_bytes: 429496729 - actions: - - name: "envoy.overload_actions.shrink_heap" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.95 - - name: "envoy.overload_actions.stop_accepting_requests" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.98 - --log-level warn - --cpuset-threads - --drain-strategy immediate @@ -267,8 +252,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 512Mi requests: cpu: 100m memory: 512Mi @@ -345,8 +328,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 32Mi requests: cpu: 10m memory: 32Mi 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 cf6d52bf7fc..3759d793c85 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 @@ -210,21 +210,6 @@ spec: typed_config: "@type": type.googleapis.com/envoy.extensions.resource_monitors.downstream_connections.v3.DownstreamConnectionsConfig max_active_downstream_connections: 50000 - - name: "envoy.resource_monitors.fixed_heap" - typed_config: - "@type": type.googleapis.com/envoy.extensions.resource_monitors.fixed_heap.v3.FixedHeapConfig - max_heap_size_bytes: 429496729 - actions: - - name: "envoy.overload_actions.shrink_heap" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.95 - - name: "envoy.overload_actions.stop_accepting_requests" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.98 - --log-level warn - --cpuset-threads - --drain-strategy immediate @@ -265,8 +250,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 512Mi requests: cpu: 100m memory: 512Mi @@ -343,8 +326,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 32Mi requests: cpu: 10m memory: 32Mi diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml index 328e59e59d0..78bea6e40b0 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-name.yaml @@ -210,21 +210,6 @@ spec: typed_config: "@type": type.googleapis.com/envoy.extensions.resource_monitors.downstream_connections.v3.DownstreamConnectionsConfig max_active_downstream_connections: 50000 - - name: "envoy.resource_monitors.fixed_heap" - typed_config: - "@type": type.googleapis.com/envoy.extensions.resource_monitors.fixed_heap.v3.FixedHeapConfig - max_heap_size_bytes: 429496729 - actions: - - name: "envoy.overload_actions.shrink_heap" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.95 - - name: "envoy.overload_actions.stop_accepting_requests" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.98 - --log-level warn - --cpuset-threads - --drain-strategy immediate @@ -265,8 +250,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 512Mi requests: cpu: 100m memory: 512Mi @@ -343,8 +326,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 32Mi requests: cpu: 10m memory: 32Mi 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 9e705136143..5afc2475eda 100644 --- a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml +++ b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml @@ -210,21 +210,6 @@ spec: typed_config: "@type": type.googleapis.com/envoy.extensions.resource_monitors.downstream_connections.v3.DownstreamConnectionsConfig max_active_downstream_connections: 50000 - - name: "envoy.resource_monitors.fixed_heap" - typed_config: - "@type": type.googleapis.com/envoy.extensions.resource_monitors.fixed_heap.v3.FixedHeapConfig - max_heap_size_bytes: 429496729 - actions: - - name: "envoy.overload_actions.shrink_heap" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.95 - - name: "envoy.overload_actions.stop_accepting_requests" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.98 - --log-level warn - --cpuset-threads - --drain-strategy immediate @@ -265,8 +250,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 512Mi requests: cpu: 100m memory: 512Mi @@ -343,8 +326,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 32Mi requests: cpu: 10m memory: 32Mi 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 d32118f94f9..4dffb567e81 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 @@ -210,21 +210,6 @@ spec: typed_config: "@type": type.googleapis.com/envoy.extensions.resource_monitors.downstream_connections.v3.DownstreamConnectionsConfig max_active_downstream_connections: 50000 - - name: "envoy.resource_monitors.fixed_heap" - typed_config: - "@type": type.googleapis.com/envoy.extensions.resource_monitors.fixed_heap.v3.FixedHeapConfig - max_heap_size_bytes: 429496729 - actions: - - name: "envoy.overload_actions.shrink_heap" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.95 - - name: "envoy.overload_actions.stop_accepting_requests" - triggers: - - name: "envoy.resource_monitors.fixed_heap" - threshold: - value: 0.98 - --log-level warn - --cpuset-threads - --drain-strategy immediate @@ -265,8 +250,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 512Mi requests: cpu: 100m memory: 512Mi @@ -343,8 +326,6 @@ spec: successThreshold: 1 timeoutSeconds: 1 resources: - limits: - memory: 32Mi requests: cpu: 10m memory: 32Mi diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/default.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/default.yaml index e1b7fe2300c..f3b49afb414 100644 --- a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/default.yaml +++ b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/default.yaml @@ -106,8 +106,6 @@ spec: requests: cpu: 100m memory: 512Mi - limits: - memory: 512Mi securityContext: allowPrivilegeEscalation: false capabilities: diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/disable-prometheus.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/disable-prometheus.yaml index 95556d6cbca..b579400b05a 100644 --- a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/disable-prometheus.yaml +++ b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/disable-prometheus.yaml @@ -96,8 +96,6 @@ spec: requests: cpu: 100m memory: 512Mi - limits: - memory: 512Mi securityContext: allowPrivilegeEscalation: false capabilities: diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/enable-tracing-custom.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/enable-tracing-custom.yaml index d7d862d3a4d..c8586388f37 100644 --- a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/enable-tracing-custom.yaml +++ b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/enable-tracing-custom.yaml @@ -121,8 +121,6 @@ spec: requests: cpu: 100m memory: 512Mi - limits: - memory: 512Mi securityContext: allowPrivilegeEscalation: false capabilities: diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/enable-tracing.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/enable-tracing.yaml index 9b28cde781f..002ee53bda6 100644 --- a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/enable-tracing.yaml +++ b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/enable-tracing.yaml @@ -121,8 +121,6 @@ spec: requests: cpu: 100m memory: 512Mi - limits: - memory: 512Mi securityContext: allowPrivilegeEscalation: false capabilities: diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/merge-annotations.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/merge-annotations.yaml index 40f444c8f76..fc6600de072 100644 --- a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/merge-annotations.yaml +++ b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/merge-annotations.yaml @@ -108,8 +108,6 @@ spec: requests: cpu: 100m memory: 512Mi - limits: - memory: 512Mi securityContext: allowPrivilegeEscalation: false capabilities: diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/merge-labels.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/merge-labels.yaml index b9fe6846fd0..0c944d8fd82 100644 --- a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/merge-labels.yaml +++ b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/merge-labels.yaml @@ -108,8 +108,6 @@ spec: requests: cpu: 100m memory: 512Mi - limits: - memory: 512Mi securityContext: allowPrivilegeEscalation: false capabilities: diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/patch-deployment.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/patch-deployment.yaml index f2beaa05cd5..5556e12d2ee 100644 --- a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/patch-deployment.yaml +++ b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/patch-deployment.yaml @@ -106,8 +106,6 @@ spec: requests: cpu: 100m memory: 512Mi - limits: - memory: 512Mi securityContext: allowPrivilegeEscalation: false capabilities: diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/with-node-selector.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/with-node-selector.yaml index 2992e8940e7..f65e6f23e18 100644 --- a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/with-node-selector.yaml +++ b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/with-node-selector.yaml @@ -106,8 +106,6 @@ spec: requests: cpu: 100m memory: 512Mi - limits: - memory: 512Mi securityContext: allowPrivilegeEscalation: false capabilities: diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/with-topology-spread-constraints.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/with-topology-spread-constraints.yaml index 7b256bfe317..e726269ccbe 100644 --- a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/with-topology-spread-constraints.yaml +++ b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/with-topology-spread-constraints.yaml @@ -106,8 +106,6 @@ spec: requests: cpu: 100m memory: 512Mi - limits: - memory: 512Mi securityContext: allowPrivilegeEscalation: false capabilities: