Skip to content
Open
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions pkg/splunk/enterprise/upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,11 @@ ClusterManager:

// check if an image upgrade is happening and whether CM has finished updating yet, return false to stop
// further reconcile operations on custom resource until CM is ready
if clusterManager.Status.Phase != enterpriseApi.PhaseReady || cmImage != spec.Image {
return false, nil
if clusterManager.Status.Phase != enterpriseApi.PhaseReady {
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)
}
if cmImage != spec.Image {
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)
}
goto IndexerCluster
}
Expand Down
Loading