From 6ac5cfe84b93fd8994b85d5fdb0f431b2e51ce75 Mon Sep 17 00:00:00 2001
From: Khue Doan <kdoan@axon.com>
Date: Tue, 24 Aug 2021 02:16:21 +0700
Subject: [PATCH] Revert "Switch ArgoCD installer from Kustomize to Helm"

This reverts commit 0f27c0b9e3f7d52ebe7810520f2db332ed57ace1.
---
 bootstrap/Makefile                  |  3 +--
 bootstrap/argocd/Chart.yaml         |  7 -------
 bootstrap/argocd/ingress.yaml       | 24 ++++++++++++++++++++++++
 bootstrap/argocd/kustomization.yaml | 10 ++++++++++
 bootstrap/argocd/namespace.yaml     |  4 ++++
 bootstrap/argocd/values.yaml        | 14 --------------
 6 files changed, 39 insertions(+), 23 deletions(-)
 delete mode 100644 bootstrap/argocd/Chart.yaml
 create mode 100644 bootstrap/argocd/ingress.yaml
 create mode 100644 bootstrap/argocd/kustomization.yaml
 create mode 100644 bootstrap/argocd/namespace.yaml
 delete mode 100644 bootstrap/argocd/values.yaml

diff --git a/bootstrap/Makefile b/bootstrap/Makefile
index c84979b6..21a3e080 100644
--- a/bootstrap/Makefile
+++ b/bootstrap/Makefile
@@ -7,8 +7,7 @@ default: argocd root-app
 
 .PHONY: argocd
 argocd:
-	helm dependencies update ./argocd
-	helm template ./argocd | kubectl apply -f -
+	kustomize build ./argocd | kubectl apply -f -
 	# TODO wait for argocd
 
 .PHONY: root-app
diff --git a/bootstrap/argocd/Chart.yaml b/bootstrap/argocd/Chart.yaml
deleted file mode 100644
index 6094b49c..00000000
--- a/bootstrap/argocd/Chart.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: v2
-name: argo-cd
-version: 3.13.0
-dependencies:
-- name: argo-cd
-  version: 3.13.0
-  repository: https://argoproj.github.io/argo-helm
diff --git a/bootstrap/argocd/ingress.yaml b/bootstrap/argocd/ingress.yaml
new file mode 100644
index 00000000..1adff434
--- /dev/null
+++ b/bootstrap/argocd/ingress.yaml
@@ -0,0 +1,24 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: argocd-server
+  labels:
+    cert-manager.io/cluster-issuer: "selfsigned-cluster-issuer"
+    nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
+    nginx.ingress.kubernetes.io/ssl-passthrough: "true"
+spec:
+  rules:
+  - host: argocd.khuedoan.com
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: argocd-server
+            port:
+              name: https
+  tls:
+  - hosts:
+    - argocd.khuedoan.com
+    secretName: argocd-secret
diff --git a/bootstrap/argocd/kustomization.yaml b/bootstrap/argocd/kustomization.yaml
new file mode 100644
index 00000000..7c880552
--- /dev/null
+++ b/bootstrap/argocd/kustomization.yaml
@@ -0,0 +1,10 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+- namespace.yaml
+- https://raw.githubusercontent.com/argoproj/argo-cd/stable/manifests/install.yaml
+- https://raw.githubusercontent.com/argoproj-labs/applicationset/stable/manifests/install.yaml
+- ingress.yaml
+
+namespace: argocd
diff --git a/bootstrap/argocd/namespace.yaml b/bootstrap/argocd/namespace.yaml
new file mode 100644
index 00000000..a040f2ba
--- /dev/null
+++ b/bootstrap/argocd/namespace.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: argocd
diff --git a/bootstrap/argocd/values.yaml b/bootstrap/argocd/values.yaml
deleted file mode 100644
index f30cfc04..00000000
--- a/bootstrap/argocd/values.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-argo-cd:
-  server:
-    ingress:
-      enabled: true
-      annotations:
-        cert-manager.io/cluster-issuer: "selfsigned-cluster-issuer"
-      hosts:
-        - argocd.khuedoan.com
-      tls:
-        - secretName: argocd-tls-certificate
-          hosts:
-            - argocd.khuedoan.com
-    extraArgs:
-      - --insecure