From da8a9e303d93d2c38cc0acd6f390477e9055600e Mon Sep 17 00:00:00 2001
From: Asara <amarpreet@minhas.io>
Date: Sat, 8 Jul 2023 15:22:57 -0400
Subject: [PATCH] Add istio for argo, add prom to argo

---
 argo/apps/values.yaml                         |  5 ++++
 helm/apps/goldpinger/install.sh               | 13 ----------
 helm/apps/goldpinger/values.yaml              |  3 ---
 .../argocd}/istio-ingress.yaml                | 26 +++++++++----------
 4 files changed, 18 insertions(+), 29 deletions(-)
 delete mode 100755 helm/apps/goldpinger/install.sh
 delete mode 100644 helm/apps/goldpinger/values.yaml
 rename helm/{apps/goldpinger => setup/argocd}/istio-ingress.yaml (62%)

diff --git a/argo/apps/values.yaml b/argo/apps/values.yaml
index 4c3eaf1..ca3bc36 100644
--- a/argo/apps/values.yaml
+++ b/argo/apps/values.yaml
@@ -5,3 +5,8 @@ helmApps:
     repoURL: https://okgolove.github.io/helm-charts
     chart: goldpinger
     revision: 5.5.0
+  - app: prometheus
+    namespace: prometheus
+    repoURL: https://prometheus-community.github.io/helm-charts
+    chart: kube-prometheus-stack
+    revision: 47.4.0
diff --git a/helm/apps/goldpinger/install.sh b/helm/apps/goldpinger/install.sh
deleted file mode 100755
index d9c60af..0000000
--- a/helm/apps/goldpinger/install.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-CHART_VERSION=5.5.0
-
-helm repo add okgolove https://okgolove.github.io/helm-charts
-helm repo update
-helm upgrade --install \
-	goldpinger \
-	okgolove/goldpinger \
-	-n goldpinger \
-	--version ${CHART_VERSION} \
-	--create-namespace \
-	--values values.yaml \
-	--cleanup-on-fail
diff --git a/helm/apps/goldpinger/values.yaml b/helm/apps/goldpinger/values.yaml
deleted file mode 100644
index 36a66d3..0000000
--- a/helm/apps/goldpinger/values.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-service:
-  type: ClusterIP
diff --git a/helm/apps/goldpinger/istio-ingress.yaml b/helm/setup/argocd/istio-ingress.yaml
similarity index 62%
rename from helm/apps/goldpinger/istio-ingress.yaml
rename to helm/setup/argocd/istio-ingress.yaml
index 4c89172..93071a9 100644
--- a/helm/apps/goldpinger/istio-ingress.yaml
+++ b/helm/setup/argocd/istio-ingress.yaml
@@ -2,13 +2,13 @@
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
-  name: goldpinger-cert
+  name: argocd-cert
   namespace: istio-system
 spec:
-  secretName: goldpinger-cert
-  commonName: goldpinger.teapot.masked.name
+  secretName: argocd-cert
+  commonName: argocd.teapot.masked.name
   dnsNames:
-    - goldpinger.teapot.masked.name
+    - argocd.teapot.masked.name
   issuerRef:
     name: vault-issuer
     kind: ClusterIssuer
@@ -18,8 +18,8 @@ spec:
 apiVersion: networking.istio.io/v1beta1
 kind: Gateway
 metadata:
-  name: goldpinger-gateway
-  namespace: goldpinger
+  name: argocd-gateway
+  namespace: argocd
 spec:
   selector:
     istio: ingressgateway-internal
@@ -30,21 +30,21 @@ spec:
       protocol: HTTPS
     tls:
       mode: SIMPLE
-      credentialName: goldpinger-cert
+      credentialName: argocd-cert
     hosts:
-    - goldpinger.teapot.masked.name
+    - argocd.teapot.masked.name
 ...
 ---
 apiVersion: networking.istio.io/v1beta1
 kind: VirtualService
 metadata:
-  name: goldpinger-gateway
-  namespace: goldpinger
+  name: argocd-gateway
+  namespace: argocd
 spec:
   hosts:
-  - goldpinger.teapot.masked.name
+  - argocd.teapot.masked.name
   gateways:
-  - goldpinger-gateway
+  - argocd-gateway
   http:
   - match:
     - uri:
@@ -53,5 +53,5 @@ spec:
     - destination:
         port:
           number: 80
-        host: goldpinger
+        host: argocd-server
 ...