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

fix(alerts): avoid reconciliation loop #549

Merged
merged 2 commits into from
Dec 12, 2024
Merged

fix(alerts): avoid reconciliation loop #549

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
3a414d4
fix(alerts): avoid reconciliation loop
richardtief Dec 11, 2024
ab008e9
chore(alerts): upgrade plugindefinition to latest chart version
richardtief Dec 11, 2024
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
2 changes: 1 addition & 1 deletion alerts/charts/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ maintainers:
name: alerts
sources:
- https://github.com/cloudoperators/greenhouse-extensions
version: 0.15.3
version: 0.15.4
richardtief marked this conversation as resolved.
Show resolved Hide resolved
keywords:
- prometheus-alertmanager
dependencies:
Expand Down
7 changes: 4 additions & 3 deletions alerts/charts/templates/ca-secret-issuer-cert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{{- if and .Values.alerts.alertmanager.enabled .Values.alerts.alertmanager.ingress.enabled }}
{{- if not (lookup "v1" "Secret" $.Release.Namespace (printf "%s-%s" $.Release.Namespace "monitoring-ca")) }}
{{- $caSecret := (lookup "v1" "Secret" $.Release.Namespace (printf "%s-%s" $.Release.Namespace "monitoring-ca")) }}
{{- if not $caSecret }}
{{- $ca := genCA (printf "%s-%s" $.Release.Name "custom-ca") 3650 }}
richardtief marked this conversation as resolved.
Show resolved Hide resolved
apiVersion: v1
kind: Secret
type: Opaque
Expand All @@ -11,12 +13,11 @@ metadata:
annotations:
"helm.sh/hook": pre-install, pre-upgrade
data:
{{- $ca := genCA (printf "%s-%s" $.Release.Name "custom-ca") 3650 }}
tls.crt: {{ $ca.Cert | b64enc | quote }}
tls.key: {{ $ca.Key | b64enc | quote }}
---
{{- end }}
{{ if .Capabilities.APIVersions.Has "cert-manager.io/v1" }}
{{- if .Capabilities.APIVersions.Has "cert-manager.io/v1" }}
apiVersion: cert-manager.io/v1
kind: Issuer
metadata:
Expand Down
4 changes: 2 additions & 2 deletions alerts/plugindefinition.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ kind: PluginDefinition
metadata:
name: alerts
spec:
version: 2.3.3
version: 2.3.4
weight: 0
displayName: Alerts
description: The Alerts Plugin consists of both Prometheus Alertmanager and Supernova, the holistic alert management UI
Expand All @@ -15,7 +15,7 @@ spec:
helmChart:
name: alerts
repository: oci://ghcr.io/cloudoperators/greenhouse-extensions/charts
version: 0.15.3
version: 0.15.4
uiApplication:
name: supernova
version: "latest"
Expand Down
Loading