Merge branch 'main' into updatecli_a244f274eca3d3509cb168400c334a33b8…

…d781b0c224c0b20f11f3d5708b53a2
jenkins-infra · Sep 25, 2023 · aa70360 · aa70360
2 parents e9a6b6d + e8085c1
commit aa70360
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 5 deletions.
diff --git a/charts/accountapp/Chart.yaml b/charts/accountapp/Chart.yaml
@@ -3,4 +3,4 @@ description: A Helm chart for accounts.jenkins.io
 maintainers:
 - name: timja
 name: accountapp
-version: 0.7.0
+version: 0.7.2
diff --git a/charts/accountapp/templates/deployment.yaml b/charts/accountapp/templates/deployment.yaml
@@ -100,8 +100,10 @@ spec:
                   path: /login
                   port: http
                   scheme: HTTP
+          {{- with .Values.resources }}
           resources:
-            {{- toYaml .Values.resources | nindent 12 }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

diff --git a/charts/accountapp/tests/custom_values_test.yaml b/charts/accountapp/tests/custom_values_test.yaml
@@ -27,3 +27,27 @@ tests:
       - equal:
           path: data.smtpPassword
           value: c210cC1wYXNzd29yZA==
+  - it: should create a Deployment with the customized values
+    set:
+      image:
+        pullPolicy: Always
+      resources:
+        limits:
+          memory: 1024Mi
+        requests:
+          cpu: 500m
+    template: deployment.yaml
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: Deployment
+      - equal:
+          path: spec.template.spec.containers[0].imagePullPolicy
+          value: Always
+      - equal:
+          path: spec.template.spec.containers[0].resources.limits.memory
+          value: 1024Mi
+      - equal:
+          path: spec.template.spec.containers[0].resources.requests.cpu
+          value: 500m
diff --git a/charts/accountapp/tests/defaults_test.yaml b/charts/accountapp/tests/defaults_test.yaml
@@ -19,3 +19,5 @@ tests:
       - equal:
           path: spec.template.spec.containers[0].imagePullPolicy
           value: IfNotPresent
+      - notExists:
+          path: spec.template.spec.containers[0].resources
diff --git a/charts/accountapp/values.yaml b/charts/accountapp/values.yaml
@@ -4,7 +4,7 @@
 replicaCount: 1
 image:
   repository: jenkinsciinfra/account-app
-  tag: 0.4.46
+  tag: 0.4.49
   pullPolicy: IfNotPresent
 imagePullSecrets: []
 nameOverride: ""
@@ -29,8 +29,8 @@ ingress:
 #    - secretName: accounts-tls
 #      hosts:
 #        - accounts.jenkins.io
-resources: # We usually recommend not to specify default resources and to leave this as a conscious
-# choice for the user. This also increases chances charts run on environments with little
+# We usually recommend not to specify default resources and to leave this as a conscious: null # choice for the user. This also increases chances charts run on environments with little
+resources: {}
 # resources, such as Minikube. If you do want to specify resources, uncomment the following
 # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
 # limits: