From f7f9c17cd4cc7a5cd2c66303b333dafc3fe02923 Mon Sep 17 00:00:00 2001
From: Alexandre Allard <alexandre.allard@scality.com>
Date: Tue, 25 Aug 2020 15:20:54 +0200
Subject: [PATCH] salt: use metalk8s storageclass

We now use a single metalk8s storageclass
instead of one per addon (e.g. metalk8s-loki).

Refs: #2742
---
 buildchain/buildchain/salt_tree.py             |  1 -
 .../addons/logging/loki/deployed/init.sls      |  2 +-
 .../logging/loki/deployed/storageclass.sls     | 18 ------------------
 3 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 salt/metalk8s/addons/logging/loki/deployed/storageclass.sls

diff --git a/buildchain/buildchain/salt_tree.py b/buildchain/buildchain/salt_tree.py
index 79acb4d56c..7ba62a369f 100644
--- a/buildchain/buildchain/salt_tree.py
+++ b/buildchain/buildchain/salt_tree.py
@@ -338,7 +338,6 @@ def _get_parts(self) -> Iterator[str]:
     Path('salt/metalk8s/addons/logging/loki/deployed/',
          'service-configuration.sls'),
     Path('salt/metalk8s/addons/logging/loki/deployed/services.sls'),
-    Path('salt/metalk8s/addons/logging/loki/deployed/storageclass.sls'),
 
     Path('salt/metalk8s/addons/prometheus-adapter/deployed/chart.sls'),
     Path('salt/metalk8s/addons/prometheus-adapter/deployed/init.sls'),
diff --git a/salt/metalk8s/addons/logging/loki/deployed/init.sls b/salt/metalk8s/addons/logging/loki/deployed/init.sls
index 024eb05ccb..5d94f66788 100644
--- a/salt/metalk8s/addons/logging/loki/deployed/init.sls
+++ b/salt/metalk8s/addons/logging/loki/deployed/init.sls
@@ -1,8 +1,8 @@
 include:
+  - ....storageclass.deployed
   - .service-configuration
   - .loki-configuration-secret
   - .chart
   - .services
-  - .storageclass
   - .datasource
   - .dashboard
diff --git a/salt/metalk8s/addons/logging/loki/deployed/storageclass.sls b/salt/metalk8s/addons/logging/loki/deployed/storageclass.sls
deleted file mode 100644
index ba5aa5e96f..0000000000
--- a/salt/metalk8s/addons/logging/loki/deployed/storageclass.sls
+++ /dev/null
@@ -1,18 +0,0 @@
-#! metalk8s_kubernetes
-
-apiVersion: storage.k8s.io/v1
-kind: StorageClass
-metadata:
-  name: metalk8s-loki
-  labels:
-    app.kubernetes.io/managed-by: salt
-    app.kubernetes.io/part-of: metalk8s
-provisioner: kubernetes.io/no-provisioner
-reclaimPolicy: Retain
-volumeBindingMode: WaitForFirstConsumer
-mountOptions:
-  - rw
-  - discard
-parameters:
-  fsType: ext4
-  mkfsOptions: '["-m", "0"]'