Skip to content

Commit

Permalink
Improved comment for the upgrade condition
Browse files Browse the repository at this point in the history
  • Loading branch information
tgarg-splunk committed Jul 20, 2023
1 parent be99408 commit 26efb68
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion pkg/splunk/enterprise/clustermanager.go
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,8 @@ func isClusterManagerReadyForUpgrade(ctx context.Context, c splcommon.Controller
return false, err
}

// check if an image upgrade is happening and whether the ClusterManager is ready for the upgrade
// check if an image upgrade is happening and whether LM has finished updating yet, return false to stop

This comment has been minimized.

Copy link
@akondur

akondur Jul 20, 2023

Collaborator

Looks good!

// further reconcile operations on CM until LM is ready
if (cr.Spec.Image != cmImage) && (licenseManager.Status.Phase != enterpriseApi.PhaseReady || lmImage != cr.Spec.Image) {
return false, nil
}
Expand Down
3 changes: 2 additions & 1 deletion pkg/splunk/enterprise/monitoringconsole.go
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,8 @@ func isMonitoringConsoleReadyForUpgrade(ctx context.Context, c splcommon.Control
return false, err
}

// check if an image upgrade is happening and whether the ClusterManager is ready for the upgrade
// check if an image upgrade is happening and whether CM has finished updating yet, return false to stop
// further reconcile operations on MC until CM is ready
if (cr.Spec.Image != mcImage) && (clusterManager.Status.Phase != enterpriseApi.PhaseReady || cmImage != cr.Spec.Image) {
return false, nil
}
Expand Down

0 comments on commit 26efb68

Please sign in to comment.