Fixed template scoping and environment variables

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.2.4
+version: 0.3.0
 
 # This is the version number of the application being deployed.
 appVersion: "4.11.0" # https://access.redhat.com/support/policy/updates/openshift # paragraph "OpenShift Support Matrix"

charts/console/templates/deployment.yaml

@@ -49,6 +49,9 @@ spec:
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           env:
+            {{- if .Values.extraEnv }}
+              {{- toYaml .Values.extraEnv | nindent 12 }}
+            {{- end }}
             - name: BRIDGE_BASE_ADDRESS
               value: {{ .Values.bridgeEnvironmentVariables.BRIDGE_BASE_ADDRESS }}
             - name: BRIDGE_USER_AUTH
@@ -66,9 +69,6 @@ spec:
               value: {{ .Values.bridgeEnvironmentVariables.BRIDGE_USER_AUTH_OIDC_ISSUER_URL }}
             - name: BRIDGE_V
               value: {{ .Values.verbosity | quote }}
-          {{- with .Values.extraEnv }}
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

charts/console/templates/ingress.yaml

@@ -56,7 +56,7 @@ spec:
               serviceName: {{ $fullName }}
               servicePort: {{ $svcPort }}
               {{- end }}
-          {{- if .Values.ingress.sslRedirect }}
+          {{- if $.Values.ingress.sslRedirect }}
           - path: {{ .path }}
             backend:
               service:
@@ -67,4 +67,4 @@ spec:
           {{- end }}
           {{- end }}
     {{- end }}
-{{- end }}
+{{- end }}

charts/console/values.yaml

@@ -61,7 +61,9 @@ bridgeEnvironmentVariables:
   BRIDGE_USER_AUTH_OIDC_ISSUER_URL: # https://my-oidc-prodiver.okta.jumpcloud.example.com
   # BRIDGE_USER_AUTH_OIDC_CLIENT_SECRET defaults to consuming vaule from values.secret.secretName
 
-extraEnv:
+extraEnv: ""
+  # - name: BRIDGE_INACTIVITY_TIMEOUT
+  #   value: 300
 
 # log-level
 verbosity: 1
@@ -72,11 +74,9 @@ service:
 
 ingress:
   enabled: false
-  sslRedirect: false
+  sslRedirect: true # Used for AWS ALB Controller
   className: ""
   annotations: {}
-    # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
   hosts:
     - host: chart-example.local
       paths: