Propagate alertmanager values to monitoring operator instead of grafana

samiulsami · samiulsami · commit 5f2e2e32d35c · 2026-04-01T17:10:27.000+06:00
operator

Signed-off-by: sami &lt;sami@appscode.com&gt;
diff --git a/charts/ace-installer-certified/templates/featuresets/opscenter-core/opscenter-features.yaml b/charts/ace-installer-certified/templates/featuresets/opscenter-core/opscenter-features.yaml
@@ -56,3 +56,4 @@ spec:
 
 {{- end }}
 {{- end }}
+
diff --git a/charts/ace-installer/templates/featuresets/opscenter-core/opscenter-features.yaml b/charts/ace-installer/templates/featuresets/opscenter-core/opscenter-features.yaml
@@ -56,3 +56,4 @@ spec:
 
 {{- end }}
 {{- end }}
+
diff --git a/charts/opscenter-features/templates/featuresets/opscenter-observability/monitoring/grafana-operator.yaml b/charts/opscenter-features/templates/featuresets/opscenter-observability/monitoring/grafana-operator.yaml
@@ -2,10 +2,6 @@
 
 {{ $vals := dig "grafana-operator" "values" (dict) .Values.helm.releases }}
 {{ $vals = mergeOverwrite $defaults $vals }}
-{{ $vals = mergeOverwrite $vals (dict "alertmanager" (dict
-  "email" .Values.alertmanager.email
-  "webhook" .Values.alertmanager.webhook
-)) }}
 
 {{- if eq (include "distro.openshift" $) "true" }}
 {{ $vals = mergeOverwrite $vals (dict "distro" .Values.distro) }}
diff --git a/charts/opscenter-features/templates/featuresets/opscenter-observability/monitoring/monitoring-operator.yaml b/charts/opscenter-features/templates/featuresets/opscenter-observability/monitoring/monitoring-operator.yaml
@@ -2,6 +2,10 @@
 
 {{ $vals := dig "monitoring-operator" "values" (dict) .Values.helm.releases }}
 {{ $vals = mergeOverwrite $defaults $vals }}
+{{ $vals = mergeOverwrite $vals (dict "alertmanager" (dict
+  "email" .Values.alertmanager.email
+  "webhook" .Values.alertmanager.webhook
+)) }}
 
 {{- if eq (include "distro.openshift" $) "true" }}
 {{ $vals = mergeOverwrite $vals (dict "distro" .Values.distro) }}

Original file line number	Diff line number	Diff line change
`@@ -56,3 +56,4 @@ spec:`
`56`	`56`
`57`	`57`	`{{- end }}`
`58`	`58`	`{{- end }}`
	`59`	`+`