proper merge

Author: asaf400

charts/console/Chart.yaml

@@ -5,7 +5,7 @@ description: A Helm chart for Kubernetes
 type: application
 
 # This is the chart version.
-version: 0.1.8
+version: 0.1.9
 
 # This is the version number of the application being deployed.
 appVersion: "4.8.0" # https://access.redhat.com/support/policy/updates/openshift # paragraph "OpenShift Support Matrix"

charts/console/templates/deployment.yaml

@@ -48,8 +48,9 @@ spec:
               port: http
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+          {{- with .Values.environmentVariables }}
           env:
-            {{- toYaml .Values.environmentVariables | nindent 12 }}
+            {{- toYaml . | nindent 12 }}
             - name: BRIDGE_BASE_ADDRESS
               value: {{ .Values.bridgeEnvironmentVariables.BRIDGE_BASE_ADDRESS }}
             - name: BRIDGE_USER_AUTH
@@ -67,6 +68,7 @@ spec:
               value: {{ .Values.bridgeEnvironmentVariables.BRIDGE_USER_AUTH_OIDC_ISSUER_URL }}
             - name: BRIDGE_V
               value: {{ .Values.verbosity }}
+          {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

charts/console/values.yaml

@@ -53,7 +53,7 @@ claims:
   groups:
   - groups
 
-environmentVariables: {}
+environmentVariables: []
 
 # merged with environmentVariables
 bridgeEnvironmentVariables: