Merge branch 'master' of git.ozg-sh.de:mgm/intelliform-adapter

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 }}

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

src/test/helm/deployment_resources_test.yaml

@@ -24,42 +24,35 @@
 
 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
+  - it: test resources
     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
+          value: 44Mi
+
+  - it: test empty resources
     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
+      - isEmpty:
+          path: spec.template.spec.containers[0].resources