From e9489b5fde4921a00ef4bdcd5bb13ac4a6933586 Mon Sep 17 00:00:00 2001
From: cahillsf <stephen.cahill@datadoghq.com>
Date: Sat, 2 Apr 2022 23:09:37 -0400
Subject: [PATCH] 
 https://github.com/kubernetes/ingress-nginx/issues/2724#issuecomment-593769295

---
 k8s-config/ingress/nginx-elb.yaml           | 18 ++++++++++++------
 k8s-config/ingress/vue-service-ingress.yaml |  4 ++++
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/k8s-config/ingress/nginx-elb.yaml b/k8s-config/ingress/nginx-elb.yaml
index 5a21924..1e115d1 100644
--- a/k8s-config/ingress/nginx-elb.yaml
+++ b/k8s-config/ingress/nginx-elb.yaml
@@ -38,6 +38,9 @@ metadata:
   namespace: ingress-nginx
 data:
   allow-snippet-annotations: 'true'
+  ssl-redirect: 'false'
+  server-snippet: |
+      listen 8000;
 ---
 # Source: ingress-nginx/templates/clusterrole.yaml
 apiVersion: rbac.authorization.k8s.io/v1
@@ -266,8 +269,8 @@ metadata:
     service.beta.kubernetes.io/aws-load-balancer-backend-protocol: tcp
     service.beta.kubernetes.io/aws-load-balancer-cross-zone-load-balancing-enabled: 'true'
     service.beta.kubernetes.io/aws-load-balancer-type: nlb
-    # service.beta.kubernetes.io/aws-load-balancer-ssl-ports: '443'
-    # service.beta.kubernetes.io/aws-load-balancer-ssl-cert: arn:aws:acm:us-east-2:187286695231:certificate/ddd727c2-f2c3-4e44-b0c3-fe0651ea5f7b
+    service.beta.kubernetes.io/aws-load-balancer-ssl-ports: '443'
+    service.beta.kubernetes.io/aws-load-balancer-ssl-cert: arn:aws:acm:us-east-2:187286695231:certificate/ddd727c2-f2c3-4e44-b0c3-fe0651ea5f7b
   labels:
     helm.sh/chart: ingress-nginx-4.0.15
     app.kubernetes.io/name: ingress-nginx
@@ -292,10 +295,10 @@ spec:
     - name: https
       port: 443
       protocol: TCP
-      targetPort: https
-      # targetPort: 80
-      appProtocol: https
-      # appProtocol: http
+      targetPort: special
+      # targetPort: https
+      # appProtocol: https
+
   selector:
     app.kubernetes.io/name: ingress-nginx
     app.kubernetes.io/instance: ingress-nginx
@@ -395,6 +398,9 @@ spec:
             - name: https
               containerPort: 443
               protocol: TCP
+            - name: special
+              containerPort: 8000
+              protocol: TCP
             - name: webhook
               containerPort: 8443
               protocol: TCP
diff --git a/k8s-config/ingress/vue-service-ingress.yaml b/k8s-config/ingress/vue-service-ingress.yaml
index c41f942..21edde8 100644
--- a/k8s-config/ingress/vue-service-ingress.yaml
+++ b/k8s-config/ingress/vue-service-ingress.yaml
@@ -6,6 +6,10 @@ metadata:
   annotations:
     kubernetes.io/ingress.class: nginx
     nginx.ingress.kubernetes.io/rewrite-target: /
+    nginx.ingress.kubernetes.io/server-snippet: |
+      if ( $server_port = 80 ) {
+         return 308 https://$host$request_uri;
+      }
     # nginx.ingress.kubernetes.io/from-to-www-redirect: "true"
     # nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
 spec: