proper sls inclusion for cert-manager

scality · Sep 19, 2024 · 3e4cab5 · 3e4cab5
1 parent 6518b78
commit 3e4cab5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 0 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/metalk8s/addons/cert-manager/init.sls → ...k8s/addons/cert-manager/deployed/init.sls b/salt/metalk8s/addons/cert-manager/init.sls → ...k8s/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
@@ -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
@@ -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