use ST2WEB_HTTPS env var instead of use_https value

Author: cognifloyd

templates/deployments.yaml

@@ -400,13 +400,13 @@ spec:
         image: '{{ template "imageRepository" . }}/st2web:{{ tpl (.Values.st2web.image.tag | default .Values.image.tag) . }}'
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         ports:
-        - containerPort: {{ .Values.st2web.use_https | ternary 443 80 }}
+        - containerPort: {{ eq (get .Values.st2web.env "ST2WEB_HTTPS" | toString) "1" | ternary 443 80 }}
         # Probe to check if app is running. Failure will lead to a pod restart.
         livenessProbe:
           httpGet:
-            scheme: {{ .Values.st2web.use_https | ternary "HTTPS" "HTTP" }}
+            scheme: {{ eq (get .Values.st2web.env "ST2WEB_HTTPS" | toString) "1" | ternary "HTTPS" "HTTP" }}
             path: /
-            port: {{ .Values.st2web.use_https | ternary 443 80 }}
+            port: {{ eq (get .Values.st2web.env "ST2WEB_HTTPS" | toString) "1" | ternary 443 80 }}
           initialDelaySeconds: 1
         # Probe to check if app is ready to serve traffic. Failure will lead to temp stop serving traffic.
         # TODO: Failing to add readinessProbe, since st2 requires authorization (401) and we don't have `/healthz` endpoints yet (https://github.com/StackStorm/st2/issues/4020)
@@ -419,15 +419,8 @@ spec:
 #            path: /api/
 #            port: 443
 #          initialDelaySeconds: 3
-        {{- if or .Values.st2web.env .Values.st2web.use_https }}
-        env:
-          {{- if .Values.st2web.env }}
-            {{- include "stackstorm-ha.customEnv" .Values.st2web | nindent 10 }}
-          {{- end }}
-          {{- if .Values.st2web.use_https }}
-          - name: ST2WEB_HTTPS
-            value: "1"
-          {{- end }}
+        {{- if .Values.st2web.env }}
+        env: {{- include "stackstorm-ha.customEnv" .Values.st2web | nindent 8 }}
         {{- end }}
         envFrom:
         - configMapRef:

templates/services.yaml

@@ -99,7 +99,7 @@ spec:
   {{- end }}
   ports:
   - protocol: TCP
-    port: {{ .Values.st2web.use_https | ternary 443 80 }}
+    port: {{ eq (get .Values.st2web.env "ST2WEB_HTTPS" | toString) "1" | ternary 443 80 }}
 
 {{ if .Values.st2chatops.enabled -}}
 ---

values.yaml

@@ -295,10 +295,11 @@ st2web:
   affinity: {}
   env: {}
   # HTTP_PROXY: http://proxy:1234
+  ## Advanced: To configure st2web to serve HTTPS (port 443) instead of HTTP (port 80)
+  ## provide ssl certs via extra_volumes, and add the ST2WEB_HTTPS env var here:
+  # ST2WEB_HTTPS: 1
   serviceAccount:
     attach: false
-  # Have st2web pod and service use HTTPS on port 443 when true. default: false (use HTTP on port 80)
-  use_https: false
   # mount extra volumes on the st2web pod(s) (primarily useful for k8s-provisioned secrets)
   ## Note that Helm templating is supported in 'mount' and 'volume'
   extra_volumes: []