feat(envs): extra env configs for the report container

Indentations of list entries (e.g. envs) are also adjusted to
be consistent with other templates.

Author: tthvo

charts/cryostat/README.md

@@ -136,6 +136,9 @@ certificate issuance and rotation.
 | `reports.resources.requests.cpu`    | CPU resource request for each Pod in the Report Generator Deployment.                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `500m`                              |
 | `reports.resources.requests.memory` | Memory resource request for each Pod in the Report Generator Deployment.                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `512Mi`                             |
 | `reports.securityContext`           | Security Context for the Report Generator containers. Defaults to meet "restricted" [Pod Security Standard](https://kubernetes.io/docs/concepts/security/pod-security-standards/#restricted). See: [SecurityContext](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#security-context-1)                                                                                                                                                                                                     | `{}`                                |
+| `reports.config.extra`              | Extra configurations for the Report Generator container                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |                                     |
+| `reports.config.extra.envVars`      | Extra environment variables for the Report Generator container. See: [Define Environment Variables](https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/)                                                                                                                                                                                                                                                                                                                        | `[]`                                |
+| `reports.config.extra.envSources`   | Sources for extra variables for the Report Generator container. See: [Define Environment Variables From ConfigMap](https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/#configure-all-key-value-pairs-in-a-configmap-as-container-environment-variables)                                                                                                                                                                                                                                       | `[]`                                |
 | `reports.nodeSelector`              | Node Selector for the Report Generator Pods. See: [NodeSelector](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#scheduling)                                                                                                                                                                                                                                                                                                                                                                 | `{}`                                |
 | `reports.tolerations`               | Tolerations for the Report Generator Pods. See: [Tolerations](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#scheduling)                                                                                                                                                                                                                                                                                                                                                                    | `[]`                                |
 | `reports.affinity`                  | Affinity for the Report Generator Pods. See: [Affinity](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#scheduling)                                                                                                                                                                                                                                                                                                                                                                          | `{}`                                |

charts/cryostat/templates/reports_deployment.yaml

@@ -43,13 +43,20 @@ spec:
           image: "{{ (.Values.reports).image.repository }}:{{ (.Values.reports).image.tag }}"
           imagePullPolicy: {{ (.Values.reports).image.pullPolicy }}
           env:
-            - name: QUARKUS_HTTP_PORT
-              value: "{{ .Values.reports.service.httpPort }}"
-            - name: QUARKUS_LOG_LEVEL
-              value: {{ .Values.reports.debug.log.level }}
+          - name: QUARKUS_HTTP_PORT
+            value: "{{ .Values.reports.service.httpPort }}"
+          - name: QUARKUS_LOG_LEVEL
+            value: {{ .Values.reports.debug.log.level }}
+          {{- with (.Values.reports.config).extra.envVars }}
+          {{- toYaml . | nindent 10 }}
+          {{- end }}
+          {{- with (.Values.reports.config).extra.envSources }}
+          envFrom:
+            {{- toYaml . | nindent 10 }}
+          {{- end }}
           ports:
-            - containerPort: {{ .Values.reports.service.httpPort }}
-              protocol: TCP
+          - containerPort: {{ .Values.reports.service.httpPort }}
+            protocol: TCP
           startupProbe:
             httpGet:
               path: "/health"

charts/cryostat/tests/reports_deployment_test.yaml

@@ -314,3 +314,59 @@ tests:
           value:
             alice: bob
             foo: bar
+
+  - it: should set extra env vars and env sources
+    set:
+      reports:
+        replicas: 1
+        config:
+          extra:
+            envVars:
+            - name: FOO
+              value: "bar"
+            - name: ANOTHER_FOO
+              valueFrom:
+                configMapKeyRef:
+                  name: myconfigmap
+                  key: another_foo
+                  optional: true
+            - name: FOO_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: mysecret
+                  key: foo_secret
+                  optional: false
+            envSources:
+            - secretRef:
+                name: sercret-special-config
+                optional: false
+            - configMapRef:
+                name: cm-special-config
+                optional: false
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[?(@.name=='cryostat-reports')].env[?(@.name=='FOO')].value
+          value: "bar"
+      - equal:
+          path: spec.template.spec.containers[?(@.name=='cryostat-reports')].env[?(@.name=='ANOTHER_FOO')].valueFrom
+          value:
+            configMapKeyRef:
+              name: "myconfigmap"
+              key: "another_foo"
+              optional: true
+      - equal:
+          path: spec.template.spec.containers[?(@.name=='cryostat-reports')].env[?(@.name=='FOO_SECRET')].valueFrom
+          value:
+            secretKeyRef:
+              name: "mysecret"
+              key: "foo_secret"
+              optional: false
+      - equal:
+          path: spec.template.spec.containers[?(@.name=='cryostat-reports')].envFrom
+          value:
+          - secretRef:
+              name: sercret-special-config
+              optional: false
+          - configMapRef:
+              name: cm-special-config
+              optional: false