From 0a25d2ea0411bae29e0e6900b8cfa50c4365de34 Mon Sep 17 00:00:00 2001
From: Micke Nordin <kano@sunet.se>
Date: Tue, 15 Oct 2024 17:17:02 +0200
Subject: [PATCH] try moving it back

---
 argocd-nginx/base/argocd-ingress.yaml                       | 2 ++
 {cert-manager => argocd-nginx}/base/cert-manager-issuer.yml | 2 +-
 argocd-nginx/base/kustomization.yaml                        | 1 +
 argocd-nginx/overlays/test/argocd-ingress.yaml              | 2 +-
 cert-manager/base/kustomization.yaml                        | 1 -
 5 files changed, 5 insertions(+), 3 deletions(-)
 rename {cert-manager => argocd-nginx}/base/cert-manager-issuer.yml (96%)

diff --git a/argocd-nginx/base/argocd-ingress.yaml b/argocd-nginx/base/argocd-ingress.yaml
index 5bf2a4c..0b26e3b 100644
--- a/argocd-nginx/base/argocd-ingress.yaml
+++ b/argocd-nginx/base/argocd-ingress.yaml
@@ -3,6 +3,8 @@ kind: Ingress
 metadata:
   name: argocd-ingress
   namespace: argocd
+  annotations:
+    cert-manager.io/issuer: "letsencrypt"
 spec:
   ingressClassName: nginx
   tls:
diff --git a/cert-manager/base/cert-manager-issuer.yml b/argocd-nginx/base/cert-manager-issuer.yml
similarity index 96%
rename from cert-manager/base/cert-manager-issuer.yml
rename to argocd-nginx/base/cert-manager-issuer.yml
index 372774b..a09c522 100644
--- a/cert-manager/base/cert-manager-issuer.yml
+++ b/argocd-nginx/base/cert-manager-issuer.yml
@@ -1,5 +1,5 @@
 apiVersion: cert-manager.io/v1
-kind: ClusterIssuer
+kind: Issuer
 metadata:
   name: letsencrypt
   namespace: cert-manager
diff --git a/argocd-nginx/base/kustomization.yaml b/argocd-nginx/base/kustomization.yaml
index 6802995..6210811 100644
--- a/argocd-nginx/base/kustomization.yaml
+++ b/argocd-nginx/base/kustomization.yaml
@@ -1,2 +1,3 @@
 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 633b535..b766fcc 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/cluster-issuer: "letsencrypt"
+    cert-manager.io/issuer: "letsencrypt"
 spec:
   defaultBackend:
     service:
diff --git a/cert-manager/base/kustomization.yaml b/cert-manager/base/kustomization.yaml
index 0fccc00..ee014cc 100644
--- a/cert-manager/base/kustomization.yaml
+++ b/cert-manager/base/kustomization.yaml
@@ -4,4 +4,3 @@ kind: Kustomization
 namespace: cert-manager
 resources:
 - https://github.com/cert-manager/cert-manager/releases/download/v1.16.1/cert-manager.yaml
-- cert-manager-issuer.yml