From 44436417d6d0f39a37137e8a9cff3efc67ffa76a Mon Sep 17 00:00:00 2001
From: Victor Barba Martin <victor.barba@navigaglobal.com>
Date: Fri, 29 Oct 2021 17:37:53 +0200
Subject: [PATCH] argocd kustomization

---
 README.md                                     |  3 ---
 k8s/argocd/base/ingress.yaml                  |  4 +--
 k8s/argocd/overlays/staging/hostname.yaml     |  4 +--
 .../overlays/staging/kustomization.yaml       |  2 +-
 k8s/haproxy/prometheus-service.yaml           | 26 +++++++++----------
 k8s/haproxy/service-monitor.yaml              | 19 --------------
 k8s/monitoring/prometheus-rules.yaml          |  1 +
 7 files changed, 19 insertions(+), 40 deletions(-)

diff --git a/README.md b/README.md
index 99d4a0e..4d31f0a 100644
--- a/README.md
+++ b/README.md
@@ -49,9 +49,6 @@ helm install cert-manager cert-manager \
 # Create cluster-issuer
 kubectl apply -f k8s/cert-manager/cluster-issuer.yaml
 
-# Create SSL Cert
-kubectl apply -f k8s/cert-manager/certificate-staging.yaml
-
 # Install ArgoCD
 kubectl create namespace argocd
 kubectl apply -n argocd -f https://raw.githubusercontent.com/argoproj/argo-cd/stable/manifests/install.yaml
diff --git a/k8s/argocd/base/ingress.yaml b/k8s/argocd/base/ingress.yaml
index 48c76ee..6e835f2 100644
--- a/k8s/argocd/base/ingress.yaml
+++ b/k8s/argocd/base/ingress.yaml
@@ -10,7 +10,7 @@ metadata:
     haproxy-ingress.github.io/backend-protocol: "h1-ssl"
 spec:
   rules:
-  - host: &host argocd.video.jamkazam.com
+  - host: example.com
     http:
       paths:
       - path: /
@@ -22,5 +22,5 @@ spec:
               name: https
   tls:
   - hosts:
-    - *host
+    - example.com
     secretName: argocd-secret # do not change, this is provided by Argo CD
\ No newline at end of file
diff --git a/k8s/argocd/overlays/staging/hostname.yaml b/k8s/argocd/overlays/staging/hostname.yaml
index 4eb994b..4955bf6 100644
--- a/k8s/argocd/overlays/staging/hostname.yaml
+++ b/k8s/argocd/overlays/staging/hostname.yaml
@@ -1,7 +1,7 @@
 ---
 - op: replace
   path: /spec/rules/0/host
-  value: &host argocd.staging.video.jamkazam.com
+  value: argocd.staging.video.jamkazam.com
 - op: replace
   path: /spec/tls/0/hosts/0
-  value: *host
+  value: argocd.staging.video.jamkazam.com
diff --git a/k8s/argocd/overlays/staging/kustomization.yaml b/k8s/argocd/overlays/staging/kustomization.yaml
index 51f007e..ac970ab 100644
--- a/k8s/argocd/overlays/staging/kustomization.yaml
+++ b/k8s/argocd/overlays/staging/kustomization.yaml
@@ -7,4 +7,4 @@ patchesJson6902:
       group: networking.k8s.io
       kind: Ingress
       name: resque
-      version: v1
\ No newline at end of file
+      version: v1
diff --git a/k8s/haproxy/prometheus-service.yaml b/k8s/haproxy/prometheus-service.yaml
index efa8e0f..d3c90fd 100644
--- a/k8s/haproxy/prometheus-service.yaml
+++ b/k8s/haproxy/prometheus-service.yaml
@@ -1,13 +1,13 @@
-# apiVersion: v1
-# kind: Service
-# metadata:
-#   name: haproxy-exporter
-#   namespace: ingress-controller
-# spec:
-#   ports:
-#   - name: exporter
-#     port: 9105 
-#     targetPort: exporter
-#   selector:
-#     app.kubernetes.io/instance: haproxy-ingress
-#     app.kubernetes.io/name: haproxy-ingress
\ No newline at end of file
+apiVersion: v1
+kind: Service
+metadata:
+  name: haproxy-exporter
+  namespace: ingress-controller
+spec:
+  ports:
+  - name: exporter
+    port: 9105 
+    targetPort: exporter
+  selector:
+    app.kubernetes.io/instance: haproxy-ingress
+    app.kubernetes.io/name: haproxy-ingress
\ No newline at end of file
diff --git a/k8s/haproxy/service-monitor.yaml b/k8s/haproxy/service-monitor.yaml
index 300db76..c0828cd 100644
--- a/k8s/haproxy/service-monitor.yaml
+++ b/k8s/haproxy/service-monitor.yaml
@@ -1,22 +1,3 @@
-# apiVersion: monitoring.coreos.com/v1
-# kind: ServiceMonitor
-# metadata:
-#   name: haproxy
-#   labels:
-#     app: haproxy
-#     release: monitoring
-# spec:
-#   selector:
-#     matchLabels:
-#       app.kubernetes.io/instance: haproxy-ingress
-#       app.kubernetes.io/name: haproxy-ingress
-#   namespaceSelector:
-#     matchNames:
-#     - ingress-controller
-#   endpoints:
-#   - port: exporter
-#     path: /metrics
-#     interval: 30s
 
 apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
diff --git a/k8s/monitoring/prometheus-rules.yaml b/k8s/monitoring/prometheus-rules.yaml
index 42350c7..e76c5f8 100644
--- a/k8s/monitoring/prometheus-rules.yaml
+++ b/k8s/monitoring/prometheus-rules.yaml
@@ -1,6 +1,7 @@
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
+  namespace: 
   creationTimestamp: null
   labels:
     prometheus: example