feat(helm): add envFrom (#4153)

* feat(helm): add envFrom + tests

Author: andrii29

CHANGELOG.md

@@ -47,6 +47,7 @@ request adding CHANGELOG notes for breaking (!) changes and possibly other secti
 
 ### New Features
 
+- Added `envFrom` support in Helm chart.
 - Added `deploymentAnnotations` support in Helm chart.
 - Added KMS properties (optional) to catalog storage config to enable S3 data encryption.
 - Added `topologySpreadConstraints` support in Helm chart.

helm/polaris/templates/deployment.yaml

@@ -94,6 +94,10 @@ spec:
             {{- tpl (toYaml .Values.extraEnv) . | nindent 12 -}}
             {{- end -}}
           {{- end }}
+          {{- if .Values.envFrom }}
+          envFrom:
+            {{- tpl (toYaml .Values.envFrom) . | nindent 12 }}
+          {{- end }}
           volumeMounts:
             - name: config-volume
               mountPath: {{ trimSuffix "/" .Values.image.configDir }}

helm/polaris/tests/deployment_test.yaml

@@ -188,7 +188,7 @@ tests:
     asserts:
       - exists:
           path: spec.template.metadata.annotations.checksum/config
-      - matchRegex: 
+      - matchRegex:
           path: spec.template.metadata.annotations.checksum/config
           pattern: "^[a-f0-9]{64}$"
   - it: should set pod annotations
@@ -1124,12 +1124,38 @@ tests:
                 name: polaris-storage-secret
                 key: awsAccessKeyId
 
+  - it: should set envFrom
+    template: deployment.yaml
+    set:
+      envFrom:
+        - secretRef:
+            name: polaris-env-secret
+        - configMapRef:
+            name: polaris-env-configmap
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].envFrom
+          content:
+            secretRef:
+              name: polaris-env-secret
+      - contains:
+          path: spec.template.spec.containers[0].envFrom
+          content:
+            configMapRef:
+              name: polaris-env-configmap
+
   - it: should not set any environment variables by default
     template: deployment.yaml
     asserts:
       - notExists:
           path: spec.template.spec.containers[0].env
 
+  - it: should not set envFrom by default
+    template: deployment.yaml
+    asserts:
+      - notExists:
+          path: spec.template.spec.containers[0].envFrom
+
   - it: should configure config volume
     template: deployment.yaml
     set:

helm/polaris/values.schema.json

@@ -193,6 +193,13 @@
                 "type": "string"
             }
         },
+        "envFrom": {
+            "description": "Bulk import environment variables from Secrets or ConfigMaps. Defines sources to populate environment variables using Kubernetes `envFrom`. Each referenced Secret or ConfigMap will expose all its key-value pairs as environment variables inside the Polaris container. [EnvFrom API](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#envfromsource-v1-core)",
+            "type": "array",
+            "items": {
+                "type": "object"
+            }
+        },
         "extraEnv": {
             "description": "Advanced configuration via Environment Variables. Extra environment variables to add to the Polaris server container. You can pass here any valid EnvVar object: [EnvVar API](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#envvar-v1-core) This can be useful to get configuration values from Kubernetes secrets or config maps.",
             "type": "array",

helm/polaris/values.yaml

@@ -643,8 +643,7 @@ advancedConfig:
 # [EnvVar API](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#envvar-v1-core)
 # This can be useful to get configuration values from Kubernetes secrets or config maps.
 # @section -- Advanced Configuration
-extraEnv:
-  []
+extraEnv: []
 #  - name: AWS_STORAGE_BUCKET
 #    value: s3://xxxxx/
 #  - name: AWS_ACCESS_KEY_ID
@@ -658,6 +657,19 @@ extraEnv:
 #        name: aws-secret
 #        key: secret_access_key
 
+# @schema item: object
+# -- Bulk import environment variables from Secrets or ConfigMaps.
+# Defines sources to populate environment variables using Kubernetes `envFrom`.
+# Each referenced Secret or ConfigMap will expose all its key-value pairs
+# as environment variables inside the Polaris container.
+# [EnvFrom API](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#envfromsource-v1-core)
+# @section -- Advanced Configuration
+envFrom: []
+#  - secretRef:
+#      name: polaris-env-secret
+#  - configMapRef:
+#      name: polaris-env-configmap
+
 # @schema item: object
 # -- Extra volumes to add to the polaris pod. See [Volumes](https://kubernetes.io/docs/concepts/storage/volumes/).
 # @section -- Advanced Configuration

site/content/in-dev/unreleased/helm-chart/reference.md

@@ -197,6 +197,7 @@ weight: 900
 |-----|------|---------|-------------|
 | advancedConfig | object | `{"quarkus.http.access-log.enabled":true}` | Advanced configuration. You can pass here any valid Polaris or Quarkus configuration property. Any property that is defined here takes precedence over all the other configuration values generated by this chart. Properties can be passed "flattened" or as nested YAML objects (see examples below). Refer to Polaris [Configuration reference](https://polaris.apache.org/in-dev/unreleased/configuration/configuration-reference) for a complete list of Polaris configuration properties, and to the [Quarkus Configuration Reference](https://quarkus.io/guides/all-config) for a complete list of Quarkus configuration properties. |
 | extraEnv | list | `[]` | Advanced configuration via Environment Variables. Extra environment variables to add to the Polaris server container. You can pass here any valid EnvVar object: [EnvVar API](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#envvar-v1-core) This can be useful to get configuration values from Kubernetes secrets or config maps. |
+| envFrom | list | `[]` | Bulk import environment variables from Secrets or ConfigMaps. Defines sources to populate environment variables using Kubernetes `envFrom`. Each referenced Secret or ConfigMap will expose all its key-value pairs as environment variables inside the Polaris container. [EnvFrom API](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#envfromsource-v1-core) |
 | extraVolumes | list | `[]` | Extra volumes to add to the polaris pod. See [Volumes](https://kubernetes.io/docs/concepts/storage/volumes/). |
 | extraVolumeMounts | list | `[]` | Extra volume mounts to add to the polaris container. See [Volumes](https://kubernetes.io/docs/concepts/storage/volumes/). |
 | extraInitContainers | list | `[]` | Add additional init containers to the polaris pod(s) See [Init Containers](https://kubernetes.io/docs/concepts/workloads/pods/init-containers/). |