Synchrony: support additional env vars (#1057)

* Support additional env vars in synchrony

* Support additional env vars in synchrony

* Support additional env vars in synchrony

* Fix helm output test

Author: bianchi2

src/main/charts/confluence/templates/_helpers.tpl

@@ -427,6 +427,15 @@ Define additional Synchrony volume mounts here to allow template overrides when
 {{- end }}
 {{- end }}
 
+{{/*
+Define additional environment variables here to allow template overrides when used as a sub chart
+*/}}
+{{- define "synchrony.additionalEnvironmentVariables" -}}
+{{- with .Values.synchrony.additionalEnvironmentVariables }}
+{{- toYaml . }}
+{{- end }}
+{{- end }}
+
 {{/*
 Define additional environment variables here to allow template overrides when used as a sub chart
 */}}

src/main/charts/confluence/templates/statefulset-synchrony.yaml

@@ -139,6 +139,7 @@ spec:
             {{ end }}
             {{- include "synchrony.databaseEnvVars" . | nindent 12 }}
             {{- include "synchrony.clusteringEnvVars" . | nindent 12 }}
+            {{- include "synchrony.additionalEnvironmentVariables" . | nindent 12 }}
       {{- if .Values.synchrony.nodeSelector }}
       nodeSelector:
       {{- toYaml .Values.synchrony.nodeSelector | nindent 8 }}

src/main/charts/confluence/values.yaml

@@ -1257,6 +1257,9 @@ synchrony:
   podAnnotations: {}
   #  name: <value>
 
+  # -- Additional environment variables passed to synchrony container
+  additionalEnvironmentVariables: []
+
   # K8s Synchrony Service configuration
   #
   service:

src/test/java/test/ContainersTest.java

@@ -40,6 +40,21 @@ void additionalEnvironmentVariables(Product product) throws Exception {
         env.assertHasValue("MY_ENV_VAR", "env-value");
     }
 
+    @ParameterizedTest
+    @EnumSource(value = Product.class, names = {"confluence"}, mode = EnumSource.Mode.INCLUDE)
+    void additionalSynchronyEnvironmentVariables(Product product) throws Exception {
+        final var pname = product.name().toLowerCase();
+        final var resources = helm.captureKubeResourcesFromHelmChart(product, Map.of(
+                "synchrony.enabled", "true",
+                "synchrony.additionalEnvironmentVariables[0].name", "MY_ENV_VAR",
+                "synchrony.additionalEnvironmentVariables[0].value", "env-value"
+        ));
+
+        final var statefulSet = resources.getStatefulSet(product.getHelmReleaseName() + "-synchrony");
+        final var env = statefulSet.getContainer().getEnv();
+        env.assertHasValue("MY_ENV_VAR", "env-value");
+    }
+
     @ParameterizedTest
     @EnumSource(value = Product.class, names = {"bamboo_agent"}, mode = EnumSource.Mode.EXCLUDE)
     void additionalPorts(Product product) throws Exception {

src/test/resources/expected_helm_output/confluence/output.yaml

@@ -349,6 +349,7 @@ data:
           securityContext: {}
         secretList: []
         secretName: null
+      additionalEnvironmentVariables: []
       additionalJvmArgs: []
       additionalLibraries: []
       additionalPorts: []