update components when autoupdatecomponents is set (#1587)

libopenstorage · Jun 25, 2024 · 6e9336f · 6e9336f
1 parent 82b23dd
commit 6e9336f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/drivers/storage/portworx/portworx.go b/drivers/storage/portworx/portworx.go
@@ -688,20 +688,20 @@ func (p *portworx) SetDefaultsOnStorageCluster(toUpdate *corev1.StorageCluster)
 			prometheusVersionChanged := p.hasPrometheusVersionChanged(toUpdate)
 			grafanaVersionChanged := p.hasGrafanaVersionChanged(toUpdate)
 			if toUpdate.Spec.Monitoring.Prometheus.Enabled &&
-				(toUpdate.Status.DesiredImages.PrometheusOperator == "" || pxVersionChanged || prometheusVersionChanged) {
+				(toUpdate.Status.DesiredImages.PrometheusOperator == "" || pxVersionChanged || prometheusVersionChanged || autoUpdateComponents(toUpdate)) {
 				toUpdate.Status.DesiredImages.Prometheus = release.Components.Prometheus
 				toUpdate.Status.DesiredImages.PrometheusOperator = release.Components.PrometheusOperator
 				toUpdate.Status.DesiredImages.PrometheusConfigMapReload = release.Components.PrometheusConfigMapReload
 				toUpdate.Status.DesiredImages.PrometheusConfigReloader = release.Components.PrometheusConfigReloader
 			}
 			if toUpdate.Spec.Monitoring.Prometheus.AlertManager != nil &&
 				toUpdate.Spec.Monitoring.Prometheus.AlertManager.Enabled &&
-				(toUpdate.Status.DesiredImages.AlertManager == "" || pxVersionChanged || prometheusVersionChanged) {
+				(toUpdate.Status.DesiredImages.AlertManager == "" || pxVersionChanged || prometheusVersionChanged || autoUpdateComponents(toUpdate)) {
 				toUpdate.Status.DesiredImages.AlertManager = release.Components.AlertManager
 			}
 			if toUpdate.Spec.Monitoring.Grafana != nil &&
 				toUpdate.Spec.Monitoring.Grafana.Enabled &&
-				(toUpdate.Status.DesiredImages.Grafana == "" || pxVersionChanged || grafanaVersionChanged) {
+				(toUpdate.Status.DesiredImages.Grafana == "" || pxVersionChanged || grafanaVersionChanged || autoUpdateComponents(toUpdate)) {
 				toUpdate.Status.DesiredImages.Grafana = release.Components.Grafana
 			}
 		}