From 778db423e352d00ab07f42507363394fa73331d0 Mon Sep 17 00:00:00 2001
From: Ayoub Nasr <ayoub.nasr@scality.com>
Date: Fri, 30 Aug 2024 10:13:34 +0200
Subject: [PATCH] proper sls inclusion for cert-manager

---
 buildchain/buildchain/salt_tree.py                     |  3 +++
 .../addons/cert-manager/{ => deployed}/init.sls        |  1 +
 .../addons/cert-manager/deployed/namespace.sls         | 10 ++++++++++
 salt/metalk8s/deployed/init.sls                        |  1 +
 4 files changed, 15 insertions(+)
 rename salt/metalk8s/addons/cert-manager/{ => deployed}/init.sls (57%)
 create mode 100644 salt/metalk8s/addons/cert-manager/deployed/namespace.sls

diff --git a/buildchain/buildchain/salt_tree.py b/buildchain/buildchain/salt_tree.py
index 469cb77f11..46810f0950 100644
--- a/buildchain/buildchain/salt_tree.py
+++ b/buildchain/buildchain/salt_tree.py
@@ -261,6 +261,9 @@ def task(self) -> types.TaskDict:
             "salt/metalk8s/addons/alert-tree/files/prometheus_rule.yaml"
         ),
     ),
+    Path("salt/metalk8s/addons/cert-manager/deployed/chart.sls"),
+    Path("salt/metalk8s/addons/cert-manager/deployed/init.sls"),
+    Path("salt/metalk8s/addons/cert-manager/deployed/namespace.sls"),
     Path("salt/metalk8s/addons/dex/ca/init.sls"),
     Path("salt/metalk8s/addons/dex/ca/installed.sls"),
     Path("salt/metalk8s/addons/dex/ca/advertised.sls"),
diff --git a/salt/metalk8s/addons/cert-manager/init.sls b/salt/metalk8s/addons/cert-manager/deployed/init.sls
similarity index 57%
rename from salt/metalk8s/addons/cert-manager/init.sls
rename to salt/metalk8s/addons/cert-manager/deployed/init.sls
index fdb92ab088..9510d7dddb 100644
--- a/salt/metalk8s/addons/cert-manager/init.sls
+++ b/salt/metalk8s/addons/cert-manager/deployed/init.sls
@@ -1,2 +1,3 @@
 include:
+  - .namespace
   - .chart
diff --git a/salt/metalk8s/addons/cert-manager/deployed/namespace.sls b/salt/metalk8s/addons/cert-manager/deployed/namespace.sls
new file mode 100644
index 0000000000..f45fbdd8da
--- /dev/null
+++ b/salt/metalk8s/addons/cert-manager/deployed/namespace.sls
@@ -0,0 +1,10 @@
+#!jinja | metalk8s_kubernetes
+
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: metalk8s-certs
+  labels:
+    app.kubernetes.io/managed-by: salt
+    app.kubernetes.io/part-of: metalk8s
+    heritage: metalk8s
diff --git a/salt/metalk8s/deployed/init.sls b/salt/metalk8s/deployed/init.sls
index cfa6886685..dec83efe11 100644
--- a/salt/metalk8s/deployed/init.sls
+++ b/salt/metalk8s/deployed/init.sls
@@ -2,6 +2,7 @@ include:
   - .core
   - metalk8s.addons.alert-logger.deployed
   - metalk8s.addons.prometheus-operator.deployed
+  - metalk8s.addons.cert-manager.deployed
   - metalk8s.addons.nginx-ingress.deployed
   - metalk8s.addons.nginx-ingress-control-plane.deployed
   - metalk8s.addons.volumes.deployed