Skip to content

Commit f4d92ec

Browse files
committed
MC Bug. Wrong err condition check and not returning mcRef retrieved from CM Spec
1 parent 54a1e64 commit f4d92ec

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

pkg/splunk/enterprise/indexercluster.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,9 @@ func ApplyIndexerCluster(client splcommon.ControllerClient, cr *enterpriseApi.In
139139
//update MC
140140
//Retrieve monitoring console ref from CM Spec
141141
cmMonitoringConsoleConfigRef, err := RetrieveCMSpec(client, cr, cr.Spec.ClusterMasterRef.Name)
142+
if err != nil {
143+
return result, err
144+
}
142145
if cmMonitoringConsoleConfigRef != "" {
143146
namespacedName := types.NamespacedName{Namespace: cr.GetNamespace(), Name: GetSplunkStatefulsetName(SplunkMonitoringConsole, cmMonitoringConsoleConfigRef)}
144147
_, err := splctrl.GetStatefulSetByName(client, namespacedName)
@@ -637,7 +640,7 @@ func RetrieveCMSpec(client splcommon.ControllerClient, cr *enterpriseApi.Indexer
637640
var monitoringConsoleRef string = ""
638641

639642
err := client.Get(context.TODO(), namespacedName, &cmCR)
640-
if err != nil {
643+
if err == nil {
641644
monitoringConsoleRef = cmCR.Spec.MonitoringConsoleRef.Name
642645
return monitoringConsoleRef, err
643646
}

0 commit comments

Comments
 (0)