Merge branch 'bugfix/do-not-remove-extra-loki-services-post-upgrade' …

…into q/2.11
scality · Mar 1, 2022 · 4542549 · 4542549
2 parents 9309687 + 6c8fa4a
commit 4542549
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,10 @@
   ignore the Ingress object that does not have the class explicitly set
   (PR[#3704](https://github.com/scality/metalk8s/pull/3704))
 
+- Fix a bug during the upgrade that remove the Loki instance services used by
+  Grafana datasources
+  (PR[#3717](https://github.com/scality/metalk8s/pull/3717))
+
 ## Release 2.11.2
 ### Bug fixes
 

diff --git a/buildchain/buildchain/salt_tree.py b/buildchain/buildchain/salt_tree.py
@@ -336,7 +336,6 @@ def task(self) -> types.TaskDict:
     Path("salt/metalk8s/addons/logging/loki/deployed/loki-configuration-secret.sls"),
     Path("salt/metalk8s/addons/logging/loki/deployed/service.sls"),
     Path("salt/metalk8s/addons/logging/loki/deployed/service-configuration.sls"),
-    Path("salt/metalk8s/addons/logging/loki/post-upgrade.sls"),
     Path("salt/metalk8s/addons/prometheus-adapter/deployed/chart.sls"),
     Path("salt/metalk8s/addons/prometheus-adapter/deployed/init.sls"),
     Path("salt/metalk8s/addons/prometheus-operator/macros.j2"),

diff --git a/salt/metalk8s/addons/logging/loki/post-upgrade.sls b/salt/metalk8s/addons/logging/loki/post-upgrade.sls
diff --git a/salt/metalk8s/orchestrate/upgrade/post.sls b/salt/metalk8s/orchestrate/upgrade/post.sls
@@ -2,5 +2,4 @@
 
 include:
   - metalk8s.addons.prometheus-operator.post-upgrade
-  - metalk8s.addons.logging.loki.post-upgrade
   - metalk8s.addons.ui.post-upgrade
diff --git a/tests/post/steps/test_logging.py b/tests/post/steps/test_logging.py
@@ -52,6 +52,11 @@ def test_logging_pipeline_is_working(host):
     pass
 
 
+@scenario("../features/logging.feature", "We can access a specific Loki instance")
+def test_instance_service(host):
+    pass
+
+
 # }}}
 # Given {{{
 
@@ -220,7 +225,7 @@ def _check_alert_exists():
     )
 
 
-@then("the Loki API is available through Service '{service}'")
+@then(parsers.parse("the Loki API is available through Service '{service}'"))
 def then_check_loki_api(k8s_client, service):
     check_loki_api(k8s_client, service)