From 9d1a988ab198ff11e1067208e5ec819c7f9c74a5 Mon Sep 17 00:00:00 2001
From: Micke Nordin <kano@sunet.se>
Date: Wed, 16 Oct 2024 09:43:36 +0200
Subject: [PATCH] Use cluster-issuer

---
 argocd-nginx/base/cert-manager-issuer.yml     | 20 -------------------
 argocd-nginx/base/kustomization.yaml          |  1 -
 .../overlays/test/argocd-ingress.yaml         |  2 +-
 .../cluster-issuer.yaml                       |  0
 4 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 argocd-nginx/base/cert-manager-issuer.yml
 rename {cert-manager => cert-cluster-issuer}/cluster-issuer.yaml (100%)

diff --git a/argocd-nginx/base/cert-manager-issuer.yml b/argocd-nginx/base/cert-manager-issuer.yml
deleted file mode 100644
index 900df6a..0000000
--- a/argocd-nginx/base/cert-manager-issuer.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-apiVersion: cert-manager.io/v1
-kind: Issuer
-metadata:
-  name: letsencrypt
-  namespace: argocd
-spec:
-  acme:
-    # The ACME server URL
-    server: https://acme-v02.api.letsencrypt.org/directory
-    # Email address used for ACME registration
-    email: kano@sunet.se
-    # Name of a secret used to store the ACME account private key
-    privateKeySecretRef:
-      name: letsencrypt
-    # Enable the HTTP-01 challenge provider
-    solvers:
-      - http01:
-          ingress:
-            ingressClassName: nginx
-
diff --git a/argocd-nginx/base/kustomization.yaml b/argocd-nginx/base/kustomization.yaml
index 6210811..6802995 100644
--- a/argocd-nginx/base/kustomization.yaml
+++ b/argocd-nginx/base/kustomization.yaml
@@ -1,3 +1,2 @@
 resources:
   - argocd-ingress.yaml
-  - cert-manager-issuer.yml
diff --git a/argocd-nginx/overlays/test/argocd-ingress.yaml b/argocd-nginx/overlays/test/argocd-ingress.yaml
index b766fcc..633b535 100644
--- a/argocd-nginx/overlays/test/argocd-ingress.yaml
+++ b/argocd-nginx/overlays/test/argocd-ingress.yaml
@@ -4,7 +4,7 @@ metadata:
   name: argocd-ingress
   namespace: argocd
   annotations:
-    cert-manager.io/issuer: "letsencrypt"
+    cert-manager.io/cluster-issuer: "letsencrypt"
 spec:
   defaultBackend:
     service:
diff --git a/cert-manager/cluster-issuer.yaml b/cert-cluster-issuer/cluster-issuer.yaml
similarity index 100%
rename from cert-manager/cluster-issuer.yaml
rename to cert-cluster-issuer/cluster-issuer.yaml