refactor: update resource limits and requests to use cpuOverride and …

…memoryOverride; modify imagePullSecret handling in templates

On-behalf-of: @SAP angel.kafazov@sap.com
Signed-off-by: Angel Kafazov <akafazov@cst-bg.net>

.gitignore

@@ -1,3 +1,4 @@
 .idea
 .vscode/settings.json
 bin/
+**/*.tgz

charts/account-operator/tests/deployment_test.yaml

@@ -9,11 +9,11 @@ tests:
       deployment:
         resources:
           limits:
-            cpu: 260m
-            memory: 512Mi
+            cpuOverride: 260m
+            memoryOverride: 512Mi
           requests:
-            cpu: 150m
-            memory: 128Mi
+            cpuOverride: 150m
+            memoryOverride: 128Mi
     asserts:
       - matchSnapshot: {}
   - it: operator match the snapshot (with kubeconfigSecret)
@@ -34,11 +34,11 @@ tests:
       deployment:
         resources:
           limits:
-            cpu: 260m
-            memory: 512Mi
+            cpuOverride: 260m
+            memoryOverride: 512Mi
           requests:
-            cpu: 150m
-            memory: 128Mi
+            cpuOverride: 150m
+            memoryOverride: 128Mi
     asserts:
       - matchSnapshot: {}
   - it: deployment with security context

charts/account-operator/values.yaml

@@ -4,9 +4,6 @@ image:
   # @param image.tag The image tag
   tag: latest
 
-# @param imagePullSecret The secret used to pull the image
-imagePullSecret: "github"
-
 # @param crds.enabled Enable CRDs
 crds:
   enabled: true
@@ -61,11 +58,11 @@ deployment:
   revisionHistoryLimit: 3
   resources:
     limits:
-      cpu: 260m
-      memory: 512Mi
+      cpuOverride: 260m
+      memoryOverride: 512Mi
     requests:
-      cpu: 150m
-      memory: 128Mi
+      cpuOverride: 150m
+      memoryOverride: 128Mi
 
 # The KCP configuration
 ## @param kcp.enabled Enable KCP

charts/common/templates/_deploymentHelpers.tpl

@@ -1,9 +1,9 @@
 {{- define "common.deploymentBasics" }}
 strategy:
   rollingUpdate:
-    maxSurge: {{ (and .Values.deployment .Values.deployment.maxSurge) | default 5 }}
-    maxUnavailable: {{ (and .Values.deployment .Values.deployment.maxUnavailable) | default 0 }}
-  type: {{ .Values.deployment.strategy }}
+    maxSurge: {{ include "common.getKeyValue" (dict "Values" .Values "key" "deployment.maxSurge") }}
+    maxUnavailable: {{ include "common.getKeyValue" (dict "Values" .Values "key" "deployment.maxUnavailable") }}
+  type: {{ include "common.getKeyValue" (dict "Values" .Values "key" "deployment.strategy") }}
 revisionHistoryLimit: 3
 selector:
   matchLabels:
@@ -18,13 +18,11 @@ image: "{{ .Values.image.name }}:{{ .Values.image.tag }}"
 {{- define "common.resources" }}
 resources:
   limits:
-    {{- if (((.Values.deployment).resources).limits).cpu }}
-    cpu: {{ (((.Values.deployment).resources).limits).cpu | quote }}
-    {{- end }}
-    memory: {{ (((.Values.deployment).resources).limits).memory | default "512Mi" | quote }}
+    cpu: {{ include "common.getKeyValue" (dict "Values" .Values "key" "deployment.resources.limits.cpu") }}
+    memory: {{ include "common.getKeyValue" (dict "Values" .Values "key" "deployment.resources.limits.memory") }}
   requests:
-    cpu: {{ (((.Values.deployment).resources).requests).cpu | default "40m" }}
-    memory: {{ (((.Values.deployment).resources).requests).memory | default "50Mi" | quote }}
+    cpu: {{ include "common.getKeyValue" (dict "Values" .Values "key" "deployment.resources.requests.cpu") }}
+    memory: {{ include "common.getKeyValue" (dict "Values" .Values "key" "deployment.resources.requests.memory") }}
 {{- end }}
 {{- define "common.ports" }}
 ports:
@@ -122,13 +120,7 @@ automountServiceAccountToken: {{ not (eq (.Values.security).mountServiceAccountT
 {{ .Values.terminationGracePeriodSeconds | default 10 }}
 {{- end }}
 {{- define "common.imagePullPolicy" -}}
-{{- if and .Values.global (.Values.global.imagePullPolicy) -}}
-{{ .Values.global.imagePullPolicy }}
-{{- else if .Values.imagePullPolicy -}}
-{{ .Values.imagePullPolicy }}
-{{- else -}}
-Always
-{{- end -}}
+{{ include "common.getKeyValue" (dict "Values" .Values "key" "imagePullPolicy") }}
 {{- end }}
 {{- define "common.PortsMetricsHealth" -}}
 - name: metrics

charts/common/templates/_imagePullSecret.tpl

@@ -1,4 +1,4 @@
 {{- define "common.imagePullSecret" }}
 imagePullSecrets:
-  - name: {{ include "common.certManagerEnabled" (dict "Values" .Values "key" "imagePullSecret") }}
+  - name: {{ include "common.getKeyValue" (dict "Values" .Values "key" "imagePullSecret") }}
 {{- end -}}

charts/common/values.yaml

@@ -1,4 +1,16 @@
 defaults:
   certManager:
     enabled: false
-  imagePullSecret: "github"
+  imagePullSecret: "github"
+  imagePullPolicy: Always
+  deployment:
+    resources:
+      limits:
+        cpu: "100m"
+        memory: "512Mi"
+      requests:
+        cpu: "40m"
+        memory: "50Mi"
+    maxSurge: 5
+    maxUnavailable: 0
+    strategy: RollingUpdate

charts/extension-manager-operator/tests/__snapshot__/deployment_test.yaml.snap

@@ -111,7 +111,7 @@ operator match the snapshot:
                 periodSeconds: 10
               resources:
                 limits:
-                  cpu: 260m
+                  cpu: 100m
                   memory: 512Mi
                 requests:
                   cpu: 40m

charts/extension-manager-operator/tests/deployment_test.yaml

@@ -74,7 +74,7 @@ tests:
   - it: test imagePullPolicy override
     template: deployment.yaml
     set:
-      imagePullPolicy: IfNotPresent
+      imagePullPolicyOverride: IfNotPresent
     asserts:
       - equal:
           path: spec.template.spec.containers[0].imagePullPolicy