Revert "feat(default-memory-limits): set default memory limits " (#4979)

Revert "feat(default-memory-limits): set default memory limits (#4960)" This reverts commit fddcf9b. Signed-off-by: zirain <[email protected]>
envoyproxy · Dec 30, 2024 · c6d5a54 · c6d5a54
1 parent fddcf9b
commit c6d5a54
Show file tree

Hide file tree

Showing 51 changed files with 0 additions and 520 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -335,8 +335,6 @@ spec:
           successThreshold: 1
           timeoutSeconds: 1
         resources:
-          limits:
-            memory: 32Mi
           requests:
             cpu: 10m
             memory: 32Mi

diff --git a/.../infrastructure/kubernetes/proxy/testdata/daemonsets/override-labels-and-annotations.yaml b/.../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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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