From 6e9336ffb36f69ae03c31d41cde86620cfa9dc9b Mon Sep 17 00:00:00 2001
From: Swarupa Vijaykumar <123443458+svijaykumar-px@users.noreply.github.com>
Date: Tue, 25 Jun 2024 09:12:48 +0530
Subject: [PATCH] update components when autoupdatecomponents is set (#1587)

---
 drivers/storage/portworx/portworx.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/storage/portworx/portworx.go b/drivers/storage/portworx/portworx.go
index cefe4d24b..6660b5cee 100644
--- a/drivers/storage/portworx/portworx.go
+++ b/drivers/storage/portworx/portworx.go
@@ -688,7 +688,7 @@ 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
@@ -696,12 +696,12 @@ func (p *portworx) SetDefaultsOnStorageCluster(toUpdate *corev1.StorageCluster)
 			}
 			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
 			}
 		}