Merge pull request #1715 from macintoshme/allow-additional-envs

chart: Added ability to use environment variables

Author: joaquimrocha

charts/headlamp/Chart.yaml

@@ -20,7 +20,7 @@ sources:
 maintainers:
   - name: kinvolk
     url: https://kinvolk.io/
-version: 0.18.1
+version: 0.18.2
 appVersion: 0.22.0
 annotations:
   artifacthub.io/category: monitoring-logging

charts/headlamp/README.md

@@ -28,6 +28,7 @@ See [MAINTAINERS.md](https://github.com/headlamp-k8s/headlamp/blob/main/MAINTAIN
 | affinity | object | `{}` | Affinity settings for pod assignment |
 | clusterRoleBinding.annotations | object | `{}` | Annotations to add to the cluster role binding |
 | clusterRoleBinding.create | bool | `true` | Specified whether a cluster role binding should be created |
+| env | list | `[]` | An optional list of environment variables |
 | fullnameOverride | string | `""` | Overrides the full name of the chart |
 | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy. One of Always, Never, IfNotPresent |
 | image.registry | string | `"ghcr.io"` | Container image registry |

charts/headlamp/templates/deployment.yaml

@@ -35,8 +35,9 @@ spec:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.registry}}/{{ .Values.image.repository }}:{{ .Values.image.tag | default (printf "v%s" .Chart.AppVersion) }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
-          {{ with .Values.config.oidc }}
+          {{ if or .Values.config.oidc .Values.env }}
           env:
+            {{- with .Values.config.oidc }}
             {{- if or .clientID (not .secret.create) }}
             - name: OIDC_CLIENT_ID
               valueFrom:
@@ -65,6 +66,10 @@ spec:
                   name: {{ .secret.name }}
                   key: scopes
             {{- end }}
+            {{- end }}
+            {{- if .Values.env }}
+            {{- toYaml .Values.env | nindent 12 }}
+            {{- end }}
           {{- end }}
           args:
             - "-in-cluster"

charts/headlamp/values.yaml

@@ -45,6 +45,13 @@ config:
   # -- directory to look for plugins
   pluginsDir: "/headlamp/plugins"
 
+# -- An optional list of environment variables
+# env:
+  # - name: KUBERNETES_SERVICE_HOST
+  #   value: localhost
+  # - name: KUBERNETES_SERVICE_PORT
+  #   value: 6443
+
 serviceAccount:
   # -- Specifies whether a service account should be created
   create: true