proper ssl-redirect for alb - list order

unit-finance · Aug 1, 2023 · 2d196b5 · 2d196b5
1 parent 774818a
commit 2d196b5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/charts/console/Chart.yaml b/charts/console/Chart.yaml
@@ -5,7 +5,7 @@ description: A Helm chart for Kubernetes
 type: application
 
 # This is the chart version.
-version: 0.4.0
+version: 0.5.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"
diff --git a/charts/console/templates/ingress.yaml b/charts/console/templates/ingress.yaml
@@ -41,6 +41,15 @@ spec:
     - host: {{ .host | quote }}
       http:
         paths:
+          {{- if $.Values.ingress.sslRedirect }}
+          - path: {{ .path }}
+            backend:
+              service:
+                name: ssl-redirect
+                port:
+                  name: use-annotation
+            pathType: {{ .pathType }}
+          {{- end }}
           {{- range .paths }}
           - path: {{ .path }}
             {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
@@ -56,15 +65,6 @@ spec:
               serviceName: {{ $fullName }}
               servicePort: {{ $svcPort }}
               {{- end }}
-          {{- if $.Values.ingress.sslRedirect }}
-          - path: {{ .path }}
-            backend:
-              service:
-                name: ssl-redirect
-                port:
-                  name: use-annotation
-            pathType: {{ .pathType }}
-          {{- end }}
           {{- end }}
     {{- end }}
 {{- end }}