Merge remote-tracking branch 'upstream/master' into e2e-in-gha

Author: mamercad

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## In Development
 * Switch to GitHub and K3s for Helm testing. (#243) (by @mamercad)
+* Set `st2client` resources by `values.yaml`. (#337) (by @mamercad)
 * Switch to the official `bats` Docker image for e2e tests. (#338)
 * Temporary workaround for #311 to use previous bitnami index from: https://github.com/bitnami/charts/issues/10539 (#312 #318) (by @0xhaven)
 * Refactor label definitions to be more consistent by building labels and label selectors in partial helper templates. (#299) (by @cognifloyd)

templates/deployments.yaml

@@ -1653,9 +1653,7 @@ spec:
             exec:
               command: ["/bin/bash", "/post-start.sh"]
         resources:
-          requests:
-            memory: "5Mi"
-            cpu: "5m"
+          {{- toYaml .Values.st2client.resources | nindent 10 }}
       volumes:
         {{- if ne "disable" (default "" .Values.st2.datastore_crypto_key) }}
         - name: st2-encryption-key-vol

values.yaml

@@ -797,6 +797,10 @@ st2client:
   nodeSelector: {}
   tolerations: []
   affinity: {}
+  resources:
+    requests:
+      memory: "5Mi"
+      cpu: "5m"
 
 # https://docs.stackstorm.com/reference/ha.html#st2garbagecollector
 # Optional service that cleans up old executions and other operations data based on setup configurations.