From 8b02a2bc0c77a6ed113ce583a1f0f1d019570fff 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 +++
 salt/_pillar/metalk8s.py                             |  1 +
 salt/metalk8s/addons/cert-manager/deployed/init.sls  | 12 ++++++++++++
 .../addons/cert-manager/deployed/namespace.sls       | 10 ++++++++++
 salt/metalk8s/addons/cert-manager/init.sls           |  2 --
 salt/metalk8s/deployed/init.sls                      |  1 +
 salt/tests/unit/formulas/data/base_pillar.yaml       |  2 ++
 7 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 salt/metalk8s/addons/cert-manager/deployed/init.sls
 create mode 100644 salt/metalk8s/addons/cert-manager/deployed/namespace.sls
 delete mode 100644 salt/metalk8s/addons/cert-manager/init.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/_pillar/metalk8s.py b/salt/_pillar/metalk8s.py
index 1ccd54f8b5..818a3a1e3f 100644
--- a/salt/_pillar/metalk8s.py
+++ b/salt/_pillar/metalk8s.py
@@ -168,6 +168,7 @@ def _load_addons(config_data):
     addons_data.setdefault("dex", {}).setdefault("enabled", True)
     addons_data.setdefault("loki", {}).setdefault("enabled", True)
     addons_data.setdefault("fluent-bit", {}).setdefault("enabled", True)
+    addons_data.setdefault("cert-manager", {}).setdefault("enabled", True)
 
     return addons_data
 
diff --git a/salt/metalk8s/addons/cert-manager/deployed/init.sls b/salt/metalk8s/addons/cert-manager/deployed/init.sls
new file mode 100644
index 0000000000..1324389d70
--- /dev/null
+++ b/salt/metalk8s/addons/cert-manager/deployed/init.sls
@@ -0,0 +1,12 @@
+{%- if pillar.addons["cert-manager"].enabled %}
+
+include:
+  - .namespace
+  - .chart
+
+{%- else %}
+
+Cert-manager is disabled, nothing to deploy:
+  test.nop
+
+{%- endif %}
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/addons/cert-manager/init.sls b/salt/metalk8s/addons/cert-manager/init.sls
deleted file mode 100644
index fdb92ab088..0000000000
--- a/salt/metalk8s/addons/cert-manager/init.sls
+++ /dev/null
@@ -1,2 +0,0 @@
-include:
-  - .chart
diff --git a/salt/metalk8s/deployed/init.sls b/salt/metalk8s/deployed/init.sls
index cfa6886685..ab9da6b4ce 100644
--- a/salt/metalk8s/deployed/init.sls
+++ b/salt/metalk8s/deployed/init.sls
@@ -1,5 +1,6 @@
 include:
   - .core
+  - metalk8s.addons.cert-manager.deployed
   - metalk8s.addons.alert-logger.deployed
   - metalk8s.addons.prometheus-operator.deployed
   - metalk8s.addons.nginx-ingress.deployed
diff --git a/salt/tests/unit/formulas/data/base_pillar.yaml b/salt/tests/unit/formulas/data/base_pillar.yaml
index 67afe6360c..953a4db1ad 100644
--- a/salt/tests/unit/formulas/data/base_pillar.yaml
+++ b/salt/tests/unit/formulas/data/base_pillar.yaml
@@ -188,3 +188,5 @@ addons:
     enabled: True
   loki:
     enabled: True
+  cert-manager:
+    enabled: True