Skip to content

Commit

Permalink
salt: Do not longer remove Loki service instance post-upgrade
Browse files Browse the repository at this point in the history
Fix a bug that delete the Loki service instance post-upgrade when it
shouldn't.

This Loki service instance and grafana datasources are deployed to
mitigate a Loki limitation when working with multi instances

See: abc293a
  • Loading branch information
TeddyAndrieux committed Feb 28, 2022
1 parent 6537d46 commit 02fb8b0
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 19 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,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

Expand Down
1 change: 0 additions & 1 deletion buildchain/buildchain/salt_tree.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down
17 changes: 0 additions & 17 deletions salt/metalk8s/addons/logging/loki/post-upgrade.sls

This file was deleted.

1 change: 0 additions & 1 deletion salt/metalk8s/orchestrate/upgrade/post.sls
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@

include:
- metalk8s.addons.prometheus-operator.post-upgrade
- metalk8s.addons.logging.loki.post-upgrade
- metalk8s.addons.ui.post-upgrade

0 comments on commit 02fb8b0

Please sign in to comment.