From 6ed340709dd62d28220edf955395e92c1a8b277e Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 9 May 2023 18:05:33 +0200
Subject: [PATCH] helm configure resources
---
src/main/helm/templates/_helpers.tpl | 18 ----------
src/main/helm/templates/deployment.yaml | 4 ++-
src/test/helm/deployment_resources_test.yaml | 36 +++++++-------------
3 files changed, 16 insertions(+), 42 deletions(-)
diff --git a/src/main/helm/templates/_helpers.tpl b/src/main/helm/templates/_helpers.tpl
index b3a576dd8..10b786e54 100644
--- a/src/main/helm/templates/_helpers.tpl
+++ b/src/main/helm/templates/_helpers.tpl
@@ -69,24 +69,6 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
{{- end -}}
{{- end -}}
-{{- define "app.resources" }}
-{{- if eq (include "app.kopEnvironment" . ) "prod" }}
- limits:
- cpu: "500m"
- memory: "1000Mi"
- requests:
- cpu: "50m"
- memory: "250Mi"
-{{- else }}
- limits:
- cpu: "500m"
- memory: "1000Mi"
- requests:
- cpu: "50m"
- memory: "250Mi"
-{{- end }}
-{{- end -}}
-
{{- define "app.ingress.host" }}
{{- if eq (.Values.image).name "formsolutions-adapter" }}
{{- printf "%s-fs.%s" (include "app.kopBezeichner" .) .Values.baseUrl }}
diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index 48bca75d6..9b5b7c082 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -111,7 +111,9 @@ spec:
successThreshold: 1
timeoutSeconds: 5
resources:
- {{- include "app.resources" . | indent 8 }}
+ {{- with .Values.resources }}
+{{ toYaml . | indent 10 }}
+ {{- end }}
securityContext:
allowPrivilegeEscalation: false
privileged: false
diff --git a/src/test/helm/deployment_resources_test.yaml b/src/test/helm/deployment_resources_test.yaml
index 588505e7e..699cc7192 100644
--- a/src/test/helm/deployment_resources_test.yaml
+++ b/src/test/helm/deployment_resources_test.yaml
@@ -24,42 +24,32 @@
suite: test deployment
release:
- name: afm_adapter
+ name: afm-adapter
templates:
- templates/deployment.yaml
tests:
- it: test resources for prod environment
- release:
- namespace: sh-helm-prod
set:
kop.environment: prod
+ resources:
+ limits:
+ cpu: "11m"
+ memory: "22Mi"
+ requests:
+ cpu: "33m"
+ memory: "44Mi"
asserts:
- equal:
path: spec.template.spec.containers[0].resources.limits.cpu
- value: 500m
+ value: 11m
- equal:
path: spec.template.spec.containers[0].resources.limits.memory
- value: 1000Mi
+ value: 22Mi
- equal:
path: spec.template.spec.containers[0].resources.requests.cpu
- value: 50m
+ value: 33m
- equal:
path: spec.template.spec.containers[0].resources.requests.memory
- value: 250Mi
- - it: test default resources
- release:
- namespace: sh-helm-test
- asserts:
- - equal:
- path: spec.template.spec.containers[0].resources.limits.cpu
- value: 500m
- - equal:
- path: spec.template.spec.containers[0].resources.limits.memory
- value: 1000Mi
- - equal:
- path: spec.template.spec.containers[0].resources.requests.cpu
- value: 50m
- - equal:
- path: spec.template.spec.containers[0].resources.requests.memory
- value: 250Mi
+ value: 44Mi
+
--
GitLab