Skip to content

Commit b9523c8

Browse files
authored
CSPL-4024: Enchance IDXC upgrade error message. (#1594)
* Add explanation for error status. * Remove outer If statement * Move goto IndexerCluster back --------- Co-authored-by: igor.grzankowski <@splunk.com>
1 parent 856ee28 commit b9523c8

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

pkg/splunk/enterprise/upgrade.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,11 @@ ClusterManager:
137137

138138
// check if an image upgrade is happening and whether CM has finished updating yet, return false to stop
139139
// further reconcile operations on custom resource until CM is ready
140-
if clusterManager.Status.Phase != enterpriseApi.PhaseReady || cmImage != spec.Image {
141-
return false, nil
140+
if clusterManager.Status.Phase != enterpriseApi.PhaseReady {
141+
return false, fmt.Errorf("cluster manager %s is not ready (phase: %s). IndexerCluster upgrade is waiting for ClusterManager to be ready", clusterManager.Name, clusterManager.Status.Phase)
142+
}
143+
if cmImage != spec.Image {
144+
return false, fmt.Errorf("cluster manager %s image (%s) does not match IndexerCluster image (%s). Please upgrade ClusterManager and IndexerCluster together using the operator's RELATED_IMAGE_SPLUNK_ENTERPRISE or upgrade the ClusterManager first", clusterManager.Name, cmImage, spec.Image)
142145
}
143146
goto IndexerCluster
144147
}

0 commit comments

Comments
 (0)