proper sls inclusion for cert-manager

scality · Aug 30, 2024 · 8b02a2b · 8b02a2b
1 parent c663e93
commit 8b02a2b
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -188,3 +188,5 @@ addons:
     enabled: True
   loki:
     enabled: True
+  cert-manager:
+    enabled: True