Add port for plain HTTP to HTTPS redirection

deploy/static/provider/aws/deploy-tls-termination.yaml

@@ -36,7 +36,13 @@ metadata:
   name: ingress-nginx-controller
   namespace: ingress-nginx
 data:
-  force-ssl-redirect: 'true'
+  http-snippet: |
+    server {
+      listen 2443;
+      return 308 https://$host$request_uri;
+    }
+  proxy-real-ip-cidr: XXX.XXX.XXX/XX
+  use-forwarded-headers: 'true'
 ---
 # Source: ingress-nginx/templates/clusterrole.yaml
 apiVersion: rbac.authorization.k8s.io/v1
@@ -263,9 +269,8 @@ metadata:
     service.beta.kubernetes.io/aws-load-balancer-backend-protocol: http
     service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: '60'
     service.beta.kubernetes.io/aws-load-balancer-cross-zone-load-balancing-enabled: 'true'
-    service.beta.kubernetes.io/aws-load-balancer-proxy-protocol: '*'
     service.beta.kubernetes.io/aws-load-balancer-ssl-cert: arn:aws:acm:us-west-2:XXXXXXXX:certificate/XXXXXX-XXXXXXX-XXXXXXX-XXXXXXXX
-    service.beta.kubernetes.io/aws-load-balancer-ssl-ports: '443'
+    service.beta.kubernetes.io/aws-load-balancer-ssl-ports: https
     service.beta.kubernetes.io/aws-load-balancer-type: elb
   labels:
     helm.sh/chart: ingress-nginx-2.0.0
@@ -283,7 +288,7 @@ spec:
     - name: http
       port: 80
       protocol: TCP
-      targetPort: http
+      targetPort: tohttps
     - name: https
       port: 443
       protocol: TCP
@@ -382,7 +387,10 @@ spec:
               containerPort: 80
               protocol: TCP
             - name: https
-              containerPort: 443
+              containerPort: 80
+              protocol: TCP
+            - name: tohttps
+              containerPort: 2443
               protocol: TCP
             - name: webhook
               containerPort: 8443