From 5e7cc6e7d8f0a884dcab0bcb518d938a93cef0c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Krop=C3=A1=C4=8Dek?= <kropikuba@gmail.com>
Date: Wed, 29 Jan 2025 16:00:06 +0100
Subject: [PATCH] argocd?

---
 helmfile.yaml                          | 12 ++++++------
 kustomization.yaml                     |  1 +
 kustomize/cert-manager-cloudflare.yaml |  3 ++-
 kustomizeconfig/clusterIssuer.yaml     |  2 +-
 values/argocd.values.yaml              | 21 ++++++++++++++++++++-
 5 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/helmfile.yaml b/helmfile.yaml
index dd96213..9524ae6 100644
--- a/helmfile.yaml
+++ b/helmfile.yaml
@@ -31,9 +31,9 @@ releases:
     version: v1.16.2
     values:
       - ./values/cert-manager.values.yaml
-  # - name: argocd
-  #   namespace: argocd
-  #   chart: argocd/argo-cd
-  #   version: 7.7.16
-  #   values:
-  #     - ./values/argocd.values.yaml
\ No newline at end of file
+  - name: argocd
+    namespace: argocd
+    chart: argocd/argo-cd
+    version: 7.7.21
+    values:
+      - ./values/argocd.values.yaml
\ No newline at end of file
diff --git a/kustomization.yaml b/kustomization.yaml
index e9814ea..84cff33 100644
--- a/kustomization.yaml
+++ b/kustomization.yaml
@@ -10,6 +10,7 @@ secretGenerator:
   - name: cert-manager-cloudflare
     envs:
       - .envs/.cloudflare
+    namespace: cert-manager
 
 configurations:
   - ./kustomizeconfig/clusterIssuer.yaml
diff --git a/kustomize/cert-manager-cloudflare.yaml b/kustomize/cert-manager-cloudflare.yaml
index 0e7fe9b..9856eac 100644
--- a/kustomize/cert-manager-cloudflare.yaml
+++ b/kustomize/cert-manager-cloudflare.yaml
@@ -1,7 +1,8 @@
 apiVersion: cert-manager.io/v1
-kind: Issuer
+kind: ClusterIssuer
 metadata:
   name: cloudflare-issuer
+  namespace: cert-manager
 spec:
   acme:
     email: kropikuba@gmail.com
diff --git a/kustomizeconfig/clusterIssuer.yaml b/kustomizeconfig/clusterIssuer.yaml
index 39224a5..c16e898 100644
--- a/kustomizeconfig/clusterIssuer.yaml
+++ b/kustomizeconfig/clusterIssuer.yaml
@@ -1,5 +1,5 @@
 nameReference:
   - kind: Secret
     fieldSpecs:
-      - kind: Issuer
+      - kind: ClusterIssuer
         path: spec/acme/solvers/dns01/cloudflare/apiTokenSecretRef/name
\ No newline at end of file
diff --git a/values/argocd.values.yaml b/values/argocd.values.yaml
index 7b9fe70..91b7769 100644
--- a/values/argocd.values.yaml
+++ b/values/argocd.values.yaml
@@ -1,3 +1,10 @@
+global:
+  domain: argo.kropcloud.net
+
+configs:
+  params:
+    server.insecure: true
+
 redis-ha:
   enabled: true
 
@@ -6,9 +13,21 @@ controller:
 
 server:
   replicas: 2
+  ingress:
+    enabled: true
+    ingressClassName: nginx
+    annotations:
+        nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+        nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
+        cert-manager.io/cluster-issuer: cloudflare-issuer
+    extraTls:
+      - hosts:
+          - argo.kropcloud.net
+        secretName: argocd-tls
+
 
 repoServer:
   replicas: 2
 
 applicationSet:
-  replicas: 2
\ No newline at end of file
+  replicas: 2