[bitnami/wildfly] Allows adding extra environment variables, an extra ConfigMap, and an extra secret (#3313)

* adds extra env vars, configmaps, and secrets

* documentation and chart bump

* documentation and chart bump

* Remove triling spaces to pass linter

Co-authored-by: Tim Hise <timothy.hise@external.milliporesigma.com>
Co-authored-by: Miguel Ángel Cabrera Miñagorri <macabrera@bitnami.com>
This commit is contained in:
Tim Hise
2020-08-04 02:25:20 -07:00
committed by GitHub
parent 2d394acba4
commit 24374e1c29
4 changed files with 35 additions and 2 deletions

View File

@@ -1,6 +1,6 @@
apiVersion: v1
name: wildfly
version: 4.1.1
version: 4.2.0
appVersion: 20.0.1
description: Chart for Wildfly
keywords:

View File

@@ -91,7 +91,10 @@ The following tables lists the configurable parameters of the WildFly chart and
| `service.loadBalancerIP` | LoadBalancer service IP address | `""` |
| `service.annotations` | Service annotations | `{}` |
| `extraVolumes` | Extra Volumes | `[]` |
| `extraVolumeMounts` | Extra Volume Mounts (normally used with extraVolumes) | `[]` |
| `extraVolumeMounts` | Extra Volume Mounts (normally used with extraVolumes) | `[]` |
| `extraEnvVars` | Extra Environment Variables | `nil` |
| `extraEnvVarsCM` | Extra Environment Variables ConfigMap | `nil` |
| `extraEnvVarsSecret` | Extra Environment Variables Secret | `nil` |
The above parameters map to the env variables defined in [bitnami/wildfly](http://github.com/bitnami/bitnami-docker-wildfly). For more information please refer to the [bitnami/wildfly](http://github.com/bitnami/bitnami-docker-wildfly) image documentation.

View File

@@ -67,6 +67,20 @@ spec:
secretKeyRef:
name: {{ template "wildfly.fullname" . }}
key: wildfly-password
{{- if .Values.extraEnvVars }}
{{- include "wildfly.tplValue" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}
{{- end }}
{{- if or .Values.extraEnvVarsCM .Values.extraEnvVarsSecret }}
envFrom:
{{- if .Values.extraEnvVarsCM }}
- configMapRef:
name: {{ .Values.extraEnvVarsCM }}
{{- end }}
{{- if .Values.extraEnvVarsSecret }}
- secretRef:
name: {{ .Values.extraEnvVarsSecret }}
{{- end }}
{{- end }}
ports:
- name: http
containerPort: 8080

View File

@@ -193,3 +193,19 @@ extraVolumes: []
## Array to add extra mounts (normally used with extraVolumes, evaluated as a template)
##
extraVolumeMounts: []
## An array to add extra env vars
## For example:
## extraEnvVars:
## - name: GF_DEFAULT_INSTANCE_NAME
## value: my-instance
##
extraEnvVars:
## ConfigMap with extra env vars:
##
extraEnvVarsCM:
## Secret with extra env vars:
##
extraEnvVarsSecret: