From d0f4bcf6e7121d06a93605e0661d1139ff3e293a Mon Sep 17 00:00:00 2001
From: momothereal <momothereal.mc@gmail.com>
Date: Sat, 26 Oct 2019 14:40:35 -0400
Subject: [PATCH] nginx ingress

---
 .gitlab-ci.yml                    | 6 +++++-
 infra/manifests/ingress.yaml      | 4 +++-
 website/chart/website/values.yaml | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 05ca7f5..2d6a6a5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,7 +54,11 @@ infra:deploy:
     - mkdir -p ${KUBECONFIG_PARENT}
     - echo ${K8S_CLUSTER_CONFIG} | base64 -d > ${KUBECONFIG}
 
-    # Deploy manifests directly
+    # Deploy nginx ingress
+    - helm init --client-only && helm repo update
+    - helm upgrade nginx-ingress stable/nginx-ingress --install --namespace ${DEPLOY_NAMESPACE} --set controller.publishService.enabled=true
+
+    # Deploy infra manifests directly
     - cd ${INFRA_SRC}/
     - kubectl apply --namespace ${DEPLOY_NAMESPACE} -R -f manifests/
   only:
diff --git a/infra/manifests/ingress.yaml b/infra/manifests/ingress.yaml
index ad6bbb5..556b510 100644
--- a/infra/manifests/ingress.yaml
+++ b/infra/manifests/ingress.yaml
@@ -1,7 +1,9 @@
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: public-ingress
+  annotations:
+    kubernetes.io/ingress.class: nginx
 spec:
   tls:
     - hosts:
diff --git a/website/chart/website/values.yaml b/website/chart/website/values.yaml
index 4c84105..b19b07f 100644
--- a/website/chart/website/values.yaml
+++ b/website/chart/website/values.yaml
@@ -11,5 +11,5 @@ nameOverride: ""
 fullnameOverride: ""
 
 service:
-  type: LoadBalancer
+  type: ClusterIP
   port: 9000