From 0b8b182d0cc3bf22ec079c865f64aa45f565bc7c Mon Sep 17 00:00:00 2001
From: JJGadgets <git@jjgadgets.tech>
Date: Sun, 26 Feb 2023 19:53:36 +0800
Subject: [PATCH] fix(ingress): restructure nginx

Signed-off-by: JJGadgets <git@jjgadgets.tech>
---
 .../1-core/05-ingress/4-nginx-external.yaml   | 57 -------------------
 .../1-core/05-ingress/kustomization.yaml      |  2 +-
 .../{3-nginx.yaml => nginx/install.yaml}      |  0
 3 files changed, 1 insertion(+), 58 deletions(-)
 delete mode 100644 kube/3-deploy/1-core/05-ingress/4-nginx-external.yaml
 rename kube/3-deploy/1-core/05-ingress/{3-nginx.yaml => nginx/install.yaml} (100%)

diff --git a/kube/3-deploy/1-core/05-ingress/4-nginx-external.yaml b/kube/3-deploy/1-core/05-ingress/4-nginx-external.yaml
deleted file mode 100644
index f60b56f8..00000000
--- a/kube/3-deploy/1-core/05-ingress/4-nginx-external.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
-kind: HelmRelease
-metadata:
-  name: ingress-nginx-ext
-  namespace: ingress
-spec:
-  chart:
-    spec:
-      chart: ingress-nginx
-      version: 4.4.2
-      sourceRef:
-        name: ingress-nginx
-  values:
-    tcp:
-      "42080": ingress/ingress-nginx-controller:20080::PROXY
-      "42443": ingress/ingress-nginx-controller:20443::PROXY
-    controller:
-      kind: DaemonSet
-      extraEnvs:
-        - name: TZ
-          value: Asia/Singapore
-      service:
-        type: NodePort
-        externalTrafficPolicy: Local
-        ports:
-          http: 80
-          https: 443
-        targetPorts:
-          http: 42080
-          https: 42443
-        nodePorts:
-          http: 80
-          https: 443
-      containerPort:
-        internalhttp: 42080
-        internalhttps: 42443
-      publishService:
-        enabled: true
-      ingressClassByName: false
-      ingressClassResource:
-        enabled: false
-      config:
-        disable-access-log: "true"
-      nodeSelector:
-        node-restriction.kubernetes.io/nodeType: awsIngress
-      tolerations:
-        - key: nodeType.jj
-          operator: Equal
-          value: awsIngress
-          effect: NoSchedule
-      resources:
-        requests:
-          cpu: 10m
-          memory: 250Mi
-        limits:
-          memory: 500Mi
diff --git a/kube/3-deploy/1-core/05-ingress/kustomization.yaml b/kube/3-deploy/1-core/05-ingress/kustomization.yaml
index e5558e1d..a2579ee8 100644
--- a/kube/3-deploy/1-core/05-ingress/kustomization.yaml
+++ b/kube/3-deploy/1-core/05-ingress/kustomization.yaml
@@ -4,5 +4,5 @@ kind: Kustomization
 resources:
   - 1-namespace.yaml
   - 2-certs.yaml
-  - 3-nginx.yaml
+  # - 3-nginx.yaml
   # - 4-nginx-external.yaml
diff --git a/kube/3-deploy/1-core/05-ingress/3-nginx.yaml b/kube/3-deploy/1-core/05-ingress/nginx/install.yaml
similarity index 100%
rename from kube/3-deploy/1-core/05-ingress/3-nginx.yaml
rename to kube/3-deploy/1-core/05-ingress/nginx/install.yaml