Merge pull request #729 from citizensadvice/limit-ingress-to-waf

fix indentation error with new annotation

Author: cnorthwood

.github/resources/preview-overrides.yaml

@@ -17,7 +17,6 @@ ingress:
     alb.ingress.kubernetes.io/scheme: internet-facing
     alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}, {"HTTPS":443}]'
     alb.ingress.kubernetes.io/healthcheck-path: /status
-    alb.ingress.kubernetes.io/actions.ssl-redirect: '{"Type": "redirect", "RedirectConfig": { "Protocol": "HTTPS", "Port": "443", "StatusCode": "HTTP_301"}}'
 
 envVars:
   RAILS_ENV: production

infrastructure/app/chart/energy-apps/templates/ingress.yaml

@@ -7,11 +7,14 @@ metadata:
   name: {{ $fullName }}
   labels:
     {{- include "energy-apps.labels" . | nindent 4 }}
-  {{- with .Values.ingress.annotations }}
   annotations:
-{{- if .Values.ingress.restrictToCdn }}
+  {{- if .Values.ingress.restrictToCdn }}
     alb.ingress.kubernetes.io/security-group-prefix-lists: pl-4fa04526
-{{- end }}
+  {{- end }}
+  {{- if .Values.ingress.redirectHttpToHttps }}
+    alb.ingress.kubernetes.io/actions.ssl-redirect: '{"Type": "redirect", "RedirectConfig": { "Protocol": "HTTPS", "Port": "443", "StatusCode": "HTTP_301"}}'
+  {{- end }}
+  {{- with .Values.ingress.annotations }}
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:

infrastructure/app/stages/dev.yaml

@@ -8,14 +8,12 @@ ingress:
         static:
           - https://energy-apps.qa.citizensadvice.org.uk
   enabled: true
-  redirectHttpToHttps: true
   restrictToCdn: true
   annotations:
     kubernetes.io/ingress.class: alb
     alb.ingress.kubernetes.io/scheme: internet-facing
-    alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}, {"HTTPS":443}]'
+    alb.ingress.kubernetes.io/listen-ports: '[{"HTTPS":443}]'
     alb.ingress.kubernetes.io/healthcheck-path: /status
-    alb.ingress.kubernetes.io/actions.ssl-redirect: '{"Type": "redirect", "RedirectConfig": { "Protocol": "HTTPS", "Port": "443", "StatusCode": "HTTP_301"}}'
 
 envVars:
   RAILS_ENV: production

infrastructure/app/stages/prod.yaml

@@ -9,14 +9,12 @@ ingress:
           - https://www.citizensadvice.org.uk/consumer/energy/energy-supply/save-energy-at-home/check-how-much-your-electrical-appliances-cost-to-use/
           - https://www.citizensadvice.org.uk/consumer/your-energy/get-a-better-energy-deal/compare-domestic-energy-suppliers-customer-service/
   enabled: true
-  redirectHttpToHttps: true
   restrictToCdn: true
   annotations:
     kubernetes.io/ingress.class: alb
     alb.ingress.kubernetes.io/scheme: internet-facing
-    alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}, {"HTTPS":443}]'
+    alb.ingress.kubernetes.io/listen-ports: '[{"HTTPS":443}]'
     alb.ingress.kubernetes.io/healthcheck-path: /status
-    alb.ingress.kubernetes.io/actions.ssl-redirect: '{"Type": "redirect", "RedirectConfig": { "Protocol": "HTTPS", "Port": "443", "StatusCode": "HTTP_301"}}'
 
 envVars:
   RAILS_ENV: production