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.

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

[prometheus-operator] Add TLS-assets for email and webhook receivers into secret which mount into alertmanager and revert to global alertmanagerConfiguration #8302

Merged
merged 1 commit into from
May 6, 2024

Conversation

name212
Copy link
Member

@name212 name212 commented May 3, 2024

Description

Revert #8158 and patch prometheus-operator for addding TLS-assets for email and webhook receivers into secret which mount into alertmanager

Why do we need it, and what problem does it solve?

Previous fix will work only d8-monitorig namespace.

Why do we need it in the patch release (if we do)?

Alert manager does not work properly.

Checklist

  • The code is covered by unit tests.
  • e2e tests passed.
  • Documentation updated according to the changes.
  • Changes were tested in the Kubernetes cluster manually.

Changelog entries

section: operator-prometheus
type: fix
summary: Add TLS-assets for email and webhook receivers into secret which mount into alertmanager.
impact_level: default
---
section: prometheus
type: fix
summary: Switch Alertmanager configuration selector from `alertmanagerConfigSelector` to `alertmanagerConfiguration`.
impact_level: default

…into secret which mount into alertmanager and revert to global alertmanagerConfiguration

Signed-off-by: Nikolay Mitrofanov <nikolay.mitrofanov@flant.com>
@github-actions github-actions bot added the area/monitoring Pull requests that update monitoring modules label May 3, 2024
@name212 name212 added this to the v1.59.9 milestone May 3, 2024
@name212 name212 marked this pull request as ready for review May 3, 2024 16:31
@name212 name212 requested a review from nabokihms as a code owner May 3, 2024 16:31
@RomanenkoDenys RomanenkoDenys added the e2e/run/gcp Run e2e tests in Google Cloud label May 3, 2024
@deckhouse-BOaTswain
Copy link
Collaborator

deckhouse-BOaTswain commented May 3, 2024

🟢 e2e: GCP for deckhouse:alertmananger-fix-tls-assets succeeded in 30m29s.

Workflow details

GCP-WithoutNAT-Containerd-1.25 - Connection string: ssh user@34.107.92.209

🟢 e2e: GCP, Containerd, Kubernetes 1.25 succeeded in 29m46s.

@github-actions github-actions bot removed the e2e/run/gcp Run e2e tests in Google Cloud label May 3, 2024
@z9r5 z9r5 added the status/backport Backport pr label May 6, 2024
@z9r5 z9r5 merged commit db74e9f into main May 6, 2024
50 of 51 checks passed
@z9r5 z9r5 deleted the alertmananger-fix-tls-assets branch May 6, 2024 06:40
github-actions bot pushed a commit that referenced this pull request May 6, 2024
…into secret which mount into alertmanager and revert to global alertmanagerConfiguration (#8302)

Signed-off-by: Nikolay Mitrofanov <nikolay.mitrofanov@flant.com>
@deckhouse-BOaTswain
Copy link
Collaborator

Cherry pick PR 8310 to the branch release-1.59 successful!

deckhouse-BOaTswain added a commit that referenced this pull request May 6, 2024
…into secret which mount into alertmanager and revert to global alertmanagerConfiguration (#8302) (#8310)

Signed-off-by: Nikolay Mitrofanov <nikolay.mitrofanov@flant.com>
Co-authored-by: Nikolay Mitrofanov <30695496+name212@users.noreply.github.com>
@deckhouse-BOaTswain deckhouse-BOaTswain removed the status/backport Backport pr label May 6, 2024
sample pushed a commit that referenced this pull request May 8, 2024
…into secret which mount into alertmanager and revert to global alertmanagerConfiguration (#8302)

Signed-off-by: Nikolay Mitrofanov <nikolay.mitrofanov@flant.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/monitoring Pull requests that update monitoring modules
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants