Improve envFrom

Author: dmunozv04

charts/guacamole/Chart.yaml

@@ -19,7 +19,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.3.0
+version: 0.3.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/guacamole/README.md

@@ -1,6 +1,6 @@
 # Apache Guacamole Helm Chart
 
-![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.6.0](https://img.shields.io/badge/AppVersion-1.6.0-informational?style=flat-square)
+![Version: 0.3.1](https://img.shields.io/badge/Version-0.3.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.6.0](https://img.shields.io/badge/AppVersion-1.6.0-informational?style=flat-square)
 
 A Helm chart for deploying Apache Guacamole, a clientless remote desktop gateway that supports standard protocols like VNC, RDP and SSH.
 
@@ -407,6 +407,28 @@ volumes:
       claimName: guacamole-recordings
 ```
 
+### Environment Variables from ConfigMaps and Secrets
+
+Both the client and guacd deployments support loading environment variables from ConfigMaps and Secrets using `envFrom`. This is useful for managing configuration externally or integrating with secret management systems.
+
+```yaml
+client:
+  envFrom:
+    configMap: "guacamole-client-config"
+    secret: "guacamole-client-secrets"
+  extraEnv:
+    - name: ADDITIONAL_VAR
+      value: "additional-value"
+
+guacd:
+  envFrom:
+    configMap: "guacd-config"
+    secret: "guacd-secrets"
+  extraEnv:
+    - name: CUSTOM_GUACD_VAR
+      value: "custom-value"
+```
+
 ### Custom Extensions
 
 ```yaml
@@ -514,13 +536,19 @@ kubectl exec -it deployment/my-guacamole-client -- nc -zv postgres.default.svc.c
 | client.image.pullPolicy | string | `"IfNotPresent"` | Client image pull policy |
 | client.service.type | string | `"ClusterIP"` | Client service type |
 | client.service.port | int | `8080` | Client service port |
+| client.envFrom.configMap | string | `""` | ConfigMap name for client environment variables |
+| client.envFrom.secret | string | `""` | Secret name for client environment variables |
+| client.extraEnv | list | `[]` | Additional environment variables for client |
 | client.initContainers | list | `[]` | Init containers for the client pod |
 | client.auth.postgresql.enabled | bool | `false` | Enable PostgreSQL authentication |
 | client.auth.mysql.enabled | bool | `false` | Enable MySQL authentication |
 | client.auth.ldap.enabled | bool | `false` | Enable LDAP authentication |
 | guacd.replicaCount | int | `1` | Number of guacd replicas |
 | guacd.image.repository | string | `"guacamole/guacd"` | Guacd container image repository |
 | guacd.service.port | int | `4822` | Guacd service port |
+| guacd.envFrom.configMap | string | `""` | ConfigMap name for guacd environment variables |
+| guacd.envFrom.secret | string | `""` | Secret name for guacd environment variables |
+| guacd.extraEnv | list | `[]` | Additional environment variables for guacd |
 | guacd.initContainers | list | `[]` | Init containers for the guacd pod |
 | ingress.enabled | bool | `false` | Enable ingress |
 | httpRoute.enabled | bool | `false` | Enable Gateway API HTTPRoute |

charts/guacamole/templates/client-deployment.yaml

@@ -51,11 +51,17 @@ spec:
             - name: http
               containerPort: {{ .Values.client.service.port }}
               protocol: TCP
+          {{- if or .Values.client.envFrom.configMap .Values.client.envFrom.secret }}
           envFrom:
+            {{- with .Values.client.envFrom.configMap }}
             - configMapRef:
-                name: {{ .Values.client.envFrom.configMap }}
+                name: {{ . }}
+            {{- end }}
+            {{- with .Values.client.envFrom.secret }}
             - secretRef:
-                name: {{ .Values.client.envFrom.secret }}
+                name: {{ . }}
+            {{- end }}
+          {{- end }}
           env:
             - name: GUACD_HOSTNAME
               value: {{ include "guacamole.fullname" . }}-guacd

charts/guacamole/templates/guacd-deployment.yaml

@@ -51,6 +51,17 @@ spec:
             - name: guacd
               containerPort: {{ .Values.guacd.service.port }}
               protocol: TCP
+          {{- if or .Values.guacd.envFrom.configMap .Values.guacd.envFrom.secret }}
+          envFrom:
+            {{- with .Values.guacd.envFrom.configMap }}
+            - configMapRef:
+                name: {{ . }}
+            {{- end }}
+            {{- with .Values.guacd.envFrom.secret }}
+            - secretRef:
+                name: {{ . }}
+            {{- end }}
+          {{- end }}
           {{- if or .Values.guacd.logLevel .Values.guacd.extraEnv }}
           env:
             {{- with .Values.guacd.logLevel }}

charts/guacamole/values.yaml

@@ -406,6 +406,14 @@ client:
       # QUICKCONNECT_DENIED_PARAMETERS: Comma-separated list of denied connection parameters
       deniedParameters: ""
 
+  # Environment variables from ConfigMaps and Secrets
+  # Used to load environment variables from external ConfigMaps and Secrets
+  envFrom:
+    # Name of ConfigMap containing environment variables
+    configMap: ""
+    # Name of Secret containing environment variables
+    secret: ""
+  
   # Additional environment variables for the client container
   # Use this to set custom environment variables not covered by the auth sections above
   extraEnv: []
@@ -605,6 +613,14 @@ guacd:
   # More information: https://guacamole.apache.org/doc/gug/configuring-guacamole.html#guacd-logging
   logLevel: ""
 
+  # Environment variables from ConfigMaps and Secrets
+  # Used to load environment variables from external ConfigMaps and Secrets
+  envFrom:
+    # Name of ConfigMap containing environment variables
+    configMap: ""
+    # Name of Secret containing environment variables
+    secret: ""
+  
   # Additional environment variables for guacd
   # Useful for custom configuration or third-party extensions
   # Example: