Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

salt: Do not longer remove Loki service instance post-upgrade #3717

Merged
merged 2 commits into from
Mar 1, 2022
Merged

salt: Do not longer remove Loki service instance post-upgrade #3717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8606684
tests: Fix test for specific service for Loki instance
TeddyAndrieux Feb 28, 2022
6c8fa4a
salt: Do not longer remove Loki service instance post-upgrade
TeddyAndrieux Feb 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion salt/metalk8s/orchestrate/upgrade/post.sls
View file
Open in desktop
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
7 changes: 6 additions & 1 deletion tests/post/steps/test_logging.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {{{

Expand Down Expand Up @@ -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)

Expand Down