[incubator/solr] add support for extra environment variables (#14614)

Signed-off-by: Joe Cai <joey.cai@gmail.com>

incubator/solr/Chart.yaml

@@ -2,7 +2,7 @@
 
 apiVersion: "v1"
 name: "solr"
-version: "1.0.0"
+version: "1.0.1"
 appVersion: "7.6.0"
 description: "A helm chart to install Apache Solr: http://lucene.apache.org/solr/"
 keywords:

incubator/solr/README.md

@@ -30,6 +30,7 @@ The following table shows the configuration options for the Solr helm chart:
 | `replicaCount`                                | The number of replicas in the Solr statefulset | `3`                                                                   |
 | `javaMem`                                     | JVM memory settings to pass to Solr | `-Xms2g -Xmx3g`                                                       |
 | `resources`                                   | Resource limits and requests to set on the solr pods | `{}` |
+| `extraEnvVars`                                | Additional environment variables to set on the solr pods (in yaml syntax) | `[]` |
 | `terminationGracePeriodSeconds`               | The termination grace period of the Solr pods | `180`|
 | `image.repository`                            | The repository to pull the docker image from| `solr`                                                                |
 | `image.tag`                                   | The tag on the repository to pull | `7.6.0`                                                               |

incubator/solr/templates/statefulset.yaml

@@ -149,6 +149,9 @@ spec:
               value: "{{ include "solr.zookeeper-name" . }}:2181"
             - name: "SOLR_LOG_LEVEL"
               value: "{{ .Values.logLevel }}"
+{{- if .Values.extraEnvVars }}
+{{ toYaml .Values.extraEnvVars | indent 12 }}
+{{- end }}
 {{ if .Values.tls.enabled }}
             - name: "SOLR_SSL_ENABLED"
               value: "true"

incubator/solr/values.yaml

@@ -12,6 +12,9 @@ javaMem: "-Xms2g -Xmx3g"
 # Set the limits and requests on solr pod resources
 resources: {}
 
+# Extra environment variables - allows yaml definitions
+extraEnvVars: []
+
 # Sets the termination Grace period for the solr pods
 # This can take a while for shards to elect new leaders
 terminationGracePeriodSeconds: 180