Skip to content

Commit c6d5a54

Browse files
zirainzirain
authored
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]>
1 parent fddcf9b commit c6d5a54

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+0
-520
lines changed

‎api/v1alpha1/envoyproxy_helpers.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,6 @@ func DefaultShutdownManagerContainerResourceRequirements() *corev1.ResourceRequi
155155
corev1.ResourceCPU: resource.MustParse(DefaultShutdownManagerCPUResourceRequests),
156156
corev1.ResourceMemory: resource.MustParse(DefaultShutdownManagerMemoryResourceRequests),
157157
},
158-
Limits: corev1.ResourceList{
159-
corev1.ResourceMemory: resource.MustParse(DefaultShutdownManagerMemoryResourceLimits),
160-
},
161158
}
162159
}
163160

‎api/v1alpha1/kubernetes_helpers.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,6 @@ func DefaultResourceRequirements() *corev1.ResourceRequirements {
7676
corev1.ResourceCPU: resource.MustParse(DefaultDeploymentCPUResourceRequests),
7777
corev1.ResourceMemory: resource.MustParse(DefaultDeploymentMemoryResourceRequests),
7878
},
79-
Limits: corev1.ResourceList{
80-
corev1.ResourceMemory: resource.MustParse(DefaultDeploymentMemoryResourceLimits),
81-
},
8279
}
8380
}
8481

‎api/v1alpha1/shared_types.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,12 @@ const (
2121
DefaultDeploymentCPUResourceRequests = "100m"
2222
// DefaultDeploymentMemoryResourceRequests for deployment memory resource
2323
DefaultDeploymentMemoryResourceRequests = "512Mi"
24-
// DefaultDeploymentMemoryResourceLimits for deployment memory resource limits
25-
DefaultDeploymentMemoryResourceLimits = "512Mi"
2624
// DefaultEnvoyProxyImage is the default image used by envoyproxy
2725
DefaultEnvoyProxyImage = "docker.io/envoyproxy/envoy:distroless-dev"
2826
// DefaultShutdownManagerCPUResourceRequests for shutdown manager cpu resource
2927
DefaultShutdownManagerCPUResourceRequests = "10m"
3028
// DefaultShutdownManagerMemoryResourceRequests for shutdown manager memory resource
3129
DefaultShutdownManagerMemoryResourceRequests = "32Mi"
32-
// DefaultShutdownManagerMemoryResourceLimits for shutdown manager memory resource limits
33-
DefaultShutdownManagerMemoryResourceLimits = "32Mi"
3430
// DefaultShutdownManagerImage is the default image used for the shutdown manager.
3531
DefaultShutdownManagerImage = "docker.io/envoyproxy/gateway-dev:latest"
3632
// DefaultRateLimitImage is the default image used by ratelimit.

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@ spec:
7979
successThreshold: 1
8080
timeoutSeconds: 1
8181
resources:
82-
limits:
83-
memory: 512Mi
8482
requests:
8583
cpu: 100m
8684
memory: 512Mi
@@ -157,8 +155,6 @@ spec:
157155
successThreshold: 1
158156
timeoutSeconds: 1
159157
resources:
160-
limits:
161-
memory: 32Mi
162158
requests:
163159
cpu: 10m
164160
memory: 32Mi

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,8 +332,6 @@ spec:
332332
successThreshold: 1
333333
timeoutSeconds: 1
334334
resources:
335-
limits:
336-
memory: 32Mi
337335
requests:
338336
cpu: 10m
339337
memory: 32Mi

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -331,8 +331,6 @@ spec:
331331
successThreshold: 1
332332
timeoutSeconds: 1
333333
resources:
334-
limits:
335-
memory: 32Mi
336334
requests:
337335
cpu: 10m
338336
memory: 32Mi

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

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -206,21 +206,6 @@ spec:
206206
typed_config:
207207
"@type": type.googleapis.com/envoy.extensions.resource_monitors.downstream_connections.v3.DownstreamConnectionsConfig
208208
max_active_downstream_connections: 50000
209-
- name: "envoy.resource_monitors.fixed_heap"
210-
typed_config:
211-
"@type": type.googleapis.com/envoy.extensions.resource_monitors.fixed_heap.v3.FixedHeapConfig
212-
max_heap_size_bytes: 429496729
213-
actions:
214-
- name: "envoy.overload_actions.shrink_heap"
215-
triggers:
216-
- name: "envoy.resource_monitors.fixed_heap"
217-
threshold:
218-
value: 0.95
219-
- name: "envoy.overload_actions.stop_accepting_requests"
220-
triggers:
221-
- name: "envoy.resource_monitors.fixed_heap"
222-
threshold:
223-
value: 0.98
224209
- --log-level warn
225210
- --cpuset-threads
226211
- --drain-strategy immediate
@@ -261,8 +246,6 @@ spec:
261246
successThreshold: 1
262247
timeoutSeconds: 1
263248
resources:
264-
limits:
265-
memory: 512Mi
266249
requests:
267250
cpu: 100m
268251
memory: 512Mi
@@ -339,8 +322,6 @@ spec:
339322
successThreshold: 1
340323
timeoutSeconds: 1
341324
resources:
342-
limits:
343-
memory: 32Mi
344325
requests:
345326
cpu: 10m
346327
memory: 32Mi

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

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -180,21 +180,6 @@ spec:
180180
typed_config:
181181
"@type": type.googleapis.com/envoy.extensions.resource_monitors.downstream_connections.v3.DownstreamConnectionsConfig
182182
max_active_downstream_connections: 50000
183-
- name: "envoy.resource_monitors.fixed_heap"
184-
typed_config:
185-
"@type": type.googleapis.com/envoy.extensions.resource_monitors.fixed_heap.v3.FixedHeapConfig
186-
max_heap_size_bytes: 429496729
187-
actions:
188-
- name: "envoy.overload_actions.shrink_heap"
189-
triggers:
190-
- name: "envoy.resource_monitors.fixed_heap"
191-
threshold:
192-
value: 0.95
193-
- name: "envoy.overload_actions.stop_accepting_requests"
194-
triggers:
195-
- name: "envoy.resource_monitors.fixed_heap"
196-
threshold:
197-
value: 0.98
198183
- --log-level warn
199184
- --cpuset-threads
200185
- --drain-strategy immediate
@@ -231,8 +216,6 @@ spec:
231216
successThreshold: 1
232217
timeoutSeconds: 1
233218
resources:
234-
limits:
235-
memory: 512Mi
236219
requests:
237220
cpu: 100m
238221
memory: 512Mi
@@ -309,8 +292,6 @@ spec:
309292
successThreshold: 1
310293
timeoutSeconds: 1
311294
resources:
312-
limits:
313-
memory: 32Mi
314295
requests:
315296
cpu: 10m
316297
memory: 32Mi

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,8 +335,6 @@ spec:
335335
successThreshold: 1
336336
timeoutSeconds: 1
337337
resources:
338-
limits:
339-
memory: 32Mi
340338
requests:
341339
cpu: 10m
342340
memory: 32Mi

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

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -215,21 +215,6 @@ spec:
215215
typed_config:
216216
"@type": type.googleapis.com/envoy.extensions.resource_monitors.downstream_connections.v3.DownstreamConnectionsConfig
217217
max_active_downstream_connections: 50000
218-
- name: "envoy.resource_monitors.fixed_heap"
219-
typed_config:
220-
"@type": type.googleapis.com/envoy.extensions.resource_monitors.fixed_heap.v3.FixedHeapConfig
221-
max_heap_size_bytes: 429496729
222-
actions:
223-
- name: "envoy.overload_actions.shrink_heap"
224-
triggers:
225-
- name: "envoy.resource_monitors.fixed_heap"
226-
threshold:
227-
value: 0.95
228-
- name: "envoy.overload_actions.stop_accepting_requests"
229-
triggers:
230-
- name: "envoy.resource_monitors.fixed_heap"
231-
threshold:
232-
value: 0.98
233218
- --log-level warn
234219
- --cpuset-threads
235220
- --drain-strategy immediate
@@ -270,8 +255,6 @@ spec:
270255
successThreshold: 1
271256
timeoutSeconds: 1
272257
resources:
273-
limits:
274-
memory: 512Mi
275258
requests:
276259
cpu: 100m
277260
memory: 512Mi
@@ -348,8 +331,6 @@ spec:
348331
successThreshold: 1
349332
timeoutSeconds: 1
350333
resources:
351-
limits:
352-
memory: 32Mi
353334
requests:
354335
cpu: 10m
355336
memory: 32Mi

0 commit comments

Comments
 (0)