Skip to content

Commit bd9e283

Browse files
lllamnyplllamnyp
committed
[platform] Always set resources for managed apps
This patch removes the loophole to leave resource requests and limits unspecified in managed apps. Any of cpu, memory, and ephemeral storage are now filled in from the resource preset (default or user-specified) if not explicitly specified in .Values.resources. "none" is no longer an accepted value in resourcePresets and the primary resources now always have some explicit value for proper billing and isolation. Signed-off-by: Timofei Larkin <[email protected]>
1 parent d2126b6 commit bd9e283

28 files changed

Lines changed: 110 additions & 128 deletions

File tree

‎packages/apps/clickhouse/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ type: application
1616
# This is the chart version. This version number should be incremented each time you make changes
1717
# to the chart and its templates, including the app version.
1818
# Versions are expected to follow Semantic Versioning (https://semver.org/)
19-
version: 0.10.1
19+
version: 0.11.0
2020

2121
# This is the version number of the application being deployed. This version number should be
2222
# incremented each time you make changes to the application. Versions are not expected to

‎packages/apps/clickhouse/templates/clickhouse.yaml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,7 @@ spec:
132132
containers:
133133
- name: clickhouse
134134
image: clickhouse/clickhouse-server:24.9.2.42
135-
{{- if .Values.resources }}
136-
resources: {{- include "cozy-lib.resources.sanitize" (list .Values.resources $) | nindent 16 }}
137-
{{- else if ne .Values.resourcesPreset "none" }}
138-
resources: {{- include "cozy-lib.resources.preset" (list .Values.resourcesPreset $) | nindent 16 }}
139-
{{- end }}
135+
resources: {{- include "cozy-lib.resources.defaultingSanitize" (list .Values.resourcesPreset .Values.resources $) | nindent 16 }}
140136
volumeMounts:
141137
- name: data-volume-template
142138
mountPath: /var/lib/clickhouse

‎packages/apps/ferretdb/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ type: application
1616
# This is the chart version. This version number should be incremented each time you make changes
1717
# to the chart and its templates, including the app version.
1818
# Versions are expected to follow Semantic Versioning (https://semver.org/)
19-
version: 0.7.1
19+
version: 0.8.0
2020

2121
# This is the version number of the application being deployed. This version number should be
2222
# incremented each time you make changes to the application. Versions are not expected to

‎packages/apps/ferretdb/templates/postgres.yaml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,7 @@ spec:
1818
{{- end }}
1919
minSyncReplicas: {{ .Values.quorum.minSyncReplicas }}
2020
maxSyncReplicas: {{ .Values.quorum.maxSyncReplicas }}
21-
{{- if .Values.resources }}
22-
resources: {{- include "cozy-lib.resources.sanitize" (list .Values.resources $) | nindent 4 }}
23-
{{- else if ne .Values.resourcesPreset "none" }}
24-
resources: {{- include "cozy-lib.resources.preset" (list .Values.resourcesPreset $) | nindent 4 }}
25-
{{- end }}
21+
resources: {{- include "cozy-lib.resources.defaultingSanitize" (list .Values.resourcesPreset .Values.resources $) | nindent 4 }}
2622
monitoring:
2723
enablePodMonitor: true
2824

‎packages/apps/http-cache/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ type: application
1616
# This is the chart version. This version number should be incremented each time you make changes
1717
# to the chart and its templates, including the app version.
1818
# Versions are expected to follow Semantic Versioning (https://semver.org/)
19-
version: 0.5.2
19+
version: 0.6.0
2020

2121
# This is the version number of the application being deployed. This version number should be
2222
# incremented each time you make changes to the application. Versions are not expected to

‎packages/apps/http-cache/templates/haproxy/deployment.yaml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,7 @@ spec:
3333
containers:
3434
- image: haproxy:latest
3535
name: haproxy
36-
{{- if .Values.haproxy.resources }}
37-
resources: {{- include "cozy-lib.resources.sanitize" (list .Values.haproxy.resources $) | nindent 10 }}
38-
{{- else if ne .Values.haproxy.resourcesPreset "none" }}
39-
resources: {{- include "cozy-lib.resources.preset" (list .Values.haproxy.resourcesPreset $) | nindent 10 }}
40-
{{- end }}
36+
resources: {{- include "cozy-lib.resources.defaultingSanitize" (list .Values.haproxy.resourcesPreset .Values.haproxy.resources $) | nindent 10 }}
4137
ports:
4238
- containerPort: 8080
4339
name: http

‎packages/apps/http-cache/templates/nginx/deployment.yaml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,7 @@ spec:
5252
shareProcessNamespace: true
5353
containers:
5454
- name: nginx
55-
{{- if $.Values.nginx.resources }}
56-
resources: {{- include "cozy-lib.resources.sanitize" (list $.Values.nginx.resources $) | nindent 10 }}
57-
{{- else if ne $.Values.nginx.resourcesPreset "none" }}
58-
resources: {{- include "cozy-lib.resources.preset" (list $.Values.nginx.resourcesPreset $) | nindent 10 }}
59-
{{- end }}
55+
resources: {{- include "cozy-lib.resources.defaultingSanitize" (list $.Values.nginx.resourcesPreset $.Values.nginx.resources $) | nindent 10 }}
6056
image: "{{ $.Files.Get "images/nginx-cache.tag" | trim }}"
6157
readinessProbe:
6258
httpGet:

‎packages/apps/kafka/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ type: application
1616
# This is the chart version. This version number should be incremented each time you make changes
1717
# to the chart and its templates, including the app version.
1818
# Versions are expected to follow Semantic Versioning (https://semver.org/)
19-
version: 0.7.1
19+
version: 0.8.0
2020

2121
# This is the version number of the application being deployed. This version number should be
2222
# incremented each time you make changes to the application. Versions are not expected to

‎packages/apps/kafka/templates/kafka.yaml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@ metadata:
88
spec:
99
kafka:
1010
replicas: {{ .Values.kafka.replicas }}
11-
{{- if .Values.kafka.resources }}
12-
resources: {{- include "cozy-lib.resources.sanitize" (list .Values.kafka.resources $) | nindent 6 }}
13-
{{- else if ne .Values.kafka.resourcesPreset "none" }}
14-
resources: {{- include "cozy-lib.resources.preset" (list .Values.kafka.resourcesPreset $) | nindent 6 }}
15-
{{- end }}
11+
resources: {{- include "cozy-lib.resources.defaultingSanitize" (list .Values.kafka.resourcesPreset .Values.kafka.resources $) | nindent 6 }}
1612
listeners:
1713
- name: plain
1814
port: 9092
@@ -70,11 +66,7 @@ spec:
7066
key: kafka-metrics-config.yml
7167
zookeeper:
7268
replicas: {{ .Values.zookeeper.replicas }}
73-
{{- if .Values.zookeeper.resources }}
74-
resources: {{- include "cozy-lib.resources.sanitize" (list .Values.zookeeper.resources $) | nindent 6 }}
75-
{{- else if ne .Values.zookeeper.resourcesPreset "none" }}
76-
resources: {{- include "cozy-lib.resources.preset" (list .Values.zookeeper.resourcesPreset $) | nindent 6 }}
77-
{{- end }}
69+
resources: {{- include "cozy-lib.resources.defaultingSanitize" (list .Values.zookeeper.resourcesPreset .Values.zookeeper.resources $) | nindent 6 }}
7870
storage:
7971
type: persistent-claim
8072
{{- with .Values.zookeeper.size }}

‎packages/apps/kubernetes/templates/cluster.yaml‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -120,23 +120,11 @@ metadata:
120120
kamaji.clastix.io/kubeconfig-secret-key: "super-admin.svc"
121121
spec:
122122
apiServer:
123-
{{- if .Values.controlPlane.apiServer.resources }}
124-
resources: {{- include "cozy-lib.resources.sanitize" (list .Values.controlPlane.apiServer.resources $) | nindent 6 }}
125-
{{- else if ne .Values.controlPlane.apiServer.resourcesPreset "none" }}
126-
resources: {{- include "cozy-lib.resources.preset" (list .Values.controlPlane.apiServer.resourcesPreset $) | nindent 6 }}
127-
{{- end }}
123+
resources: {{- include "cozy-lib.resources.defaultingSanitize" (list .Values.controlPlane.apiServer.resourcesPreset .Values.controlPlane.apiServer.resources $) | nindent 6 }}
128124
controllerManager:
129-
{{- if .Values.controlPlane.controllerManager.resources }}
130-
resources: {{- include "cozy-lib.resources.sanitize" (list .Values.controlPlane.controllerManager.resources $) | nindent 6 }}
131-
{{- else if ne .Values.controlPlane.controllerManager.resourcesPreset "none" }}
132-
resources: {{- include "cozy-lib.resources.preset" (list .Values.controlPlane.controllerManager.resourcesPreset $) | nindent 6 }}
133-
{{- end }}
125+
resources: {{- include "cozy-lib.resources.defaultingSanitize" (list .Values.controlPlane.controllerManager.resourcesPreset .Values.controlPlane.controllerManager.resources $) | nindent 6 }}
134126
scheduler:
135-
{{- if .Values.controlPlane.scheduler.resources }}
136-
resources: {{- include "cozy-lib.resources.sanitize" (list .Values.controlPlane.scheduler.resources $) | nindent 6 }}
137-
{{- else if ne .Values.controlPlane.scheduler.resourcesPreset "none" }}
138-
resources: {{- include "cozy-lib.resources.preset" (list .Values.controlPlane.scheduler.resourcesPreset $) | nindent 6 }}
139-
{{- end }}
127+
resources: {{- include "cozy-lib.resources.defaultingSanitize" (list .Values.controlPlane.scheduler.resourcesPreset .Values.controlPlane.scheduler.resources $) | nindent 6 }}
140128
dataStoreName: "{{ $etcd }}"
141129
addons:
142130
coreDNS:
@@ -145,11 +133,7 @@ spec:
145133
konnectivity:
146134
server:
147135
port: 8132
148-
{{- if .Values.controlPlane.konnectivity.server.resources }}
149-
resources: {{- include "cozy-lib.resources.sanitize" (list .Values.controlPlane.konnectivity.server.resources $) | nindent 10 }}
150-
{{- else if ne .Values.controlPlane.konnectivity.server.resourcesPreset "none" }}
151-
resources: {{- include "cozy-lib.resources.preset" (list .Values.controlPlane.konnectivity.server.resourcesPreset $) | nindent 10 }}
152-
{{- end }}
136+
resources: {{- include "cozy-lib.resources.defaultingSanitize" (list .Values.controlPlane.konnectivity.server.resourcesPreset .Values.controlPlane.konnectivity.server.resources $) | nindent 10 }}
153137
kubelet:
154138
cgroupfs: systemd
155139
preferredAddressTypes:

0 commit comments

Comments
 (0)