add support for custom env vars

Author: monrax

README.md

@@ -259,34 +259,52 @@ Datanode configmap name
 {{- include "graylog.fullname" . | printf "%s-datanode-config" }}
 {{- end }}
 
+{{/*
+Custom enviroment variables
+usage: {{ include "graylog.custom.env" .Values.{graylog|datanode} | indent N }}
+*/}}
+{{- define "graylog.custom.env" }}
+{{- $explicit := list }}
+{{- range $_, $e := .custom.extraEnv }}
+{{- if $e.name }}{{ $explicit = append $explicit .name }}{{ end }}
+- {{ toYaml $e | nindent 2 | trim }}
+{{- end }}
+{{- range $k, $v := .custom.env }}
+{{- if has $k $explicit | not }}
+- name: {{ $k }}
+  value: {{ $v | quote }}
+{{- end }}
+{{- end }}
+{{- end }}
+
 {{/*
 Graylog plugins
 */}}
 {{- define "graylog.pluginURLs" }}
-{{- if and .Values.graylog.config.plugins.enabled .Values.graylog.config.init.assetFetch.enabled .Values.graylog.config.init.assetFetch.plugins.enabled }}
+{{- if and .Values.graylog.config.plugins.enabled .Values.graylog.config.init.assetFetch.enabled .Values.graylog.config.init.assetFetch.plugins.enabled .Values.graylog.plugins }}
 {{- $urls := list }}
 {{- $baseUrl := .Values.graylog.config.init.assetFetch.plugins.baseUrl | default "" }}
 {{- $skipChecksum := .Values.graylog.config.init.assetFetch.skipChecksum | default false }}
 {{- $allowHttp := .Values.graylog.config.init.assetFetch.allowHttp | default false }}
 {{- if not $allowHttp | and (hasPrefix "http://" $baseUrl) }}
 {{- printf "Validation error: plugin baseUrl is '%s'. Only HTTPS is allowed for plugin URLs." $baseUrl | fail }}
 {{- end }}
-{{- range $name, $plugin := .Values.graylog.config.plugins }}
-{{- $url := $plugin.url }}
+{{- range .Values.graylog.plugins }}
+{{- $url := .url }}
 {{- if $url }}
-{{- if and (not $skipChecksum) (empty $plugin.checksum) }}
-{{- printf "Validation error: checksum verification is enabled but no checksum hash has been provided for plugin '%s'." $name | fail }}
+{{- if and (not $skipChecksum) (empty .checksum) }}
+{{- printf "Validation error: checksum verification is enabled but no checksum hash has been provided for plugin '%s'." .name | fail }}
 {{- end }}
 {{- if and (hasPrefix "http://" $url | not) (hasPrefix "https://" $url | not) }}
 {{- $url = printf "%s/%s" (trimSuffix "/" $baseUrl) (trimPrefix "/" $url) }}
 {{- end }}
 {{- if not $allowHttp | and (hasPrefix "http://" $url) }}
-{{- printf "Validation error: plugin '%s' is using URL '%s'. Only HTTPS is allowed for plugin URLs." $name $url | fail }}
+{{- printf "Validation error: plugin '%s' is using URL '%s'. Only HTTPS is allowed for plugin URLs." .name $url | fail }}
 {{- end }}
 {{- if not $skipChecksum }}
-{{- $url = printf "%s|%s" $url $plugin.checksum }}
+{{- $url = printf "%s|%s" $url .checksum }}
 {{- end }}
-{{- $urls = printf "%s|%s" $name $url | append $urls }}
+{{- $urls = printf "%s|%s" .name $url | append $urls }}
 {{- end }}
 {{- end }}
 {{- $urls | join "^" | quote }}

graylog/templates/_helpers.tpl

@@ -87,6 +87,7 @@ spec:
                 secretKeyRef:
                   name: {{ include "graylog.secretsName" . }}
                   key: GRAYLOG_S3_CLIENT_DEFAULT_ACCESS_KEY
+            {{- include "graylog.custom.env" .Values.datanode | indent 12 }}
           ports:
             - name: api
               containerPort: {{ .Values.datanode.custom.service.ports.api | default 8999 | int }}

graylog/templates/workload/statefulsets/datanode.yaml

@@ -76,7 +76,7 @@ spec:
               mountPath: /mnt/data
             - name: init-script
               mountPath: /scripts
-            {{- if .Values.graylog.config.plugins.enabled }}
+        {{- if .Values.graylog.config.plugins.enabled }}
             - name: init-plugins
               mountPath: /mnt/plugins
             {{- range .Values.graylog.plugins }}
@@ -85,8 +85,6 @@ spec:
               mountPath: {{ printf "/mnt/shared/plugins/%s" .name }}
             {{- end }}
             {{- end }}
-            {{- end }}
-        {{- if .Values.graylog.config.plugins.enabled }}
         {{- range .Values.graylog.plugins }}
         {{- if empty .existingClaim | and .image }}
         - name: {{ printf "copy-plugin-%s" .name }}
@@ -102,13 +100,9 @@ spec:
         - name: graylog-app
           image: {{ include "graylog.image" . }}
           imagePullPolicy: {{ .Values.graylog.custom.image.imagePullPolicy }}
-          {{- if .Values.graylog.custom.env | default list | len | lt 0 }}
+          {{- if or .Values.graylog.custom.env .Values.graylog.custom.extraEnv }}
           env:
-            {{- range .Values.graylog.custom.env }}
-            {{- $envList := splitList "=" . }}
-            - name: {{ index $envList 0 | quote }}
-              value: {{ index $envList 1 | quote }}
-            {{- end }}
+            {{- include "graylog.custom.env" .Values.graylog | indent 12 }}
           {{- end }}
           envFrom:
             - configMapRef:
@@ -187,14 +181,10 @@ spec:
       - name: init-plugins
         emptyDir: {}
       {{- range .Values.graylog.plugins }}
-      {{- if empty .url }}
+      {{- if empty .url | and .existingClaim }}
       - name: {{ .name }}
-        {{- if .existingClaim }}
         persistentVolumeClaim:
           claimName: {{ .existingClaim }}
-        {{- else }}
-        emptyDir: {}
-        {{- end }}
       {{- end }}
       {{- end }}
       {{- end }}

graylog/templates/workload/statefulsets/graylog.yaml

@@ -137,6 +137,18 @@
             "affinity": {
               "type": "object"
             },
+            "env": {
+              "type": "object",
+              "additionalProperties": {
+                "type": ["string","number","boolean"]
+              },
+              "description": "Key/value env vars rendered as literals"
+            },
+            "extraEnv": {
+              "type": "array",
+              "items": { "type": "object" },
+              "description": "Full EnvVar objects (supports valueFrom)"
+            },
             "inputs": {
               "type": "object",
               "properties": {
@@ -293,6 +305,18 @@
             "affinity": {
               "type": "object"
             },
+            "env": {
+              "type": "object",
+              "additionalProperties": {
+                "type": ["string","number","boolean"]
+              },
+              "description": "Key/value env vars rendered as literals"
+            },
+            "extraEnv": {
+              "type": "array",
+              "items": { "type": "object" },
+              "description": "Full EnvVar objects (supports valueFrom)"
+            },
             "image": {
               "type": "object",
               "properties": {

graylog/values.schema.json

@@ -114,6 +114,8 @@ graylog:
     nodeSelector: {}
     tolerations: {}
     affinity: {}
+    env: {}
+    extraEnv: []
     inputs:
       enabled: true
     metrics:
@@ -123,7 +125,6 @@ graylog:
       tag: ""
       imagePullPolicy: IfNotPresent
       imagePullSecrets: []
-    env:
     updateStrategy:
       type:
       rollingUpdate:
@@ -195,6 +196,8 @@ datanode:
     nodeSelector: {}
     tolerations: {}
     affinity: {}
+    env: {}
+    extraEnv: []
     image:
       repository: ""
       tag: ""