Skip to content

Commit 91a276b

Browse files
authored
Set minAllowed and resource requests for apiserver sidecars (#1042)
1 parent c8188a2 commit 91a276b

File tree

3 files changed

+19
-1
lines changed

3 files changed

+19
-1
lines changed

charts/kube-master/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
apiVersion: v1
22
description: A Helm chart for Kubernetes
33
name: kube-master
4-
version: 2.1.9
4+
version: 2.1.10

charts/kube-master/templates/api-vpa.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,16 @@ spec:
2020
{{- if .Values.api.resources.limits }}
2121
maxAllowed:
2222
{{- toYaml .Values.api.resources.limits | nindent 12 }}
23+
{{- end }}
24+
- containerName: wormhole
25+
controlledResources: ["cpu", "memory"]
26+
minAllowed:
27+
cpu: 50m
28+
memory: 128Mi
29+
{{- if .Values.audit }}
30+
- containerName: fluentd
31+
controlledResources: ["cpu", "memory"]
32+
minAllowed:
33+
cpu: 25m
34+
memory: 128Mi
2335
{{- end }}

charts/kube-master/templates/api.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,10 @@ spec:
369369
{{ toYaml .Values.api.resources | indent 12 }}
370370
- name: wormhole
371371
image: {{ include "wormhole.image" . | quote }}
372+
resources:
373+
requests:
374+
cpu: 50m
375+
memory: 128Mi
372376
command:
373377
- sh
374378
- -ec
@@ -407,6 +411,8 @@ spec:
407411
image: {{ include "fluentd.image" . | quote }}
408412
resources:
409413
requests:
414+
cpu: 25m
415+
memory: 128Mi
410416
ephemeral-storage: "2Gi"
411417
args: ["--suppress-config-dump"]
412418
env:

0 commit comments

Comments
 (0)