CSPL-4360 Fix errors with failing validation on status

Author: kasiakoziol

pkg/splunk/enterprise/indexercluster.go

@@ -77,10 +77,6 @@ func ApplyIndexerClusterManager(ctx context.Context, client splcommon.Controller
 
 	// updates status after function completes
 	cr.Status.ClusterManagerPhase = enterpriseApi.PhaseError
-	if cr.Status.Replicas < cr.Spec.Replicas {
-		cr.Status.Bus = &enterpriseApi.BusSpec{}
-		cr.Status.LargeMessageStore = &enterpriseApi.LargeMessageStoreSpec{}
-	}
 	cr.Status.Replicas = cr.Spec.Replicas
 	cr.Status.Selector = fmt.Sprintf("app.kubernetes.io/instance=splunk-%s-indexer", cr.GetName())
 	if cr.Status.Peers == nil {
@@ -296,7 +292,7 @@ func ApplyIndexerClusterManager(ctx context.Context, client splcommon.Controller
 
 		// If bus is updated
 		if cr.Spec.BusRef.Name != "" {
-			if !reflect.DeepEqual(cr.Status.Bus, bus.Spec) || !reflect.DeepEqual(cr.Status.LargeMessageStore, lms.Spec) {
+			if cr.Status.Bus == nil || cr.Status.LargeMessageStore == nil || !reflect.DeepEqual(cr.Status.Bus, bus.Spec) || !reflect.DeepEqual(cr.Status.LargeMessageStore, lms.Spec) {
 				mgr := newIndexerClusterPodManager(scopedLog, cr, namespaceScopedSecret, splclient.NewSplunkClient)
 				err = mgr.handlePullBusChange(ctx, cr, busCopy, lmsCopy, client)
 				if err != nil {
@@ -407,10 +403,6 @@ func ApplyIndexerCluster(ctx context.Context, client splcommon.ControllerClient,
 	// updates status after function completes
 	cr.Status.Phase = enterpriseApi.PhaseError
 	cr.Status.ClusterMasterPhase = enterpriseApi.PhaseError
-	if cr.Status.Replicas < cr.Spec.Replicas {
-		cr.Status.Bus = &enterpriseApi.BusSpec{}
-		cr.Status.LargeMessageStore = &enterpriseApi.LargeMessageStoreSpec{}
-	}
 	cr.Status.Replicas = cr.Spec.Replicas
 	cr.Status.Selector = fmt.Sprintf("app.kubernetes.io/instance=splunk-%s-indexer", cr.GetName())
 	if cr.Status.Peers == nil {
@@ -629,7 +621,7 @@ func ApplyIndexerCluster(ctx context.Context, client splcommon.ControllerClient,
 
 		// If bus is updated
 		if cr.Spec.BusRef.Name != "" {
-			if !reflect.DeepEqual(cr.Status.Bus, bus.Spec) || !reflect.DeepEqual(cr.Status.LargeMessageStore, lms.Spec) {
+			if cr.Status.Bus == nil || cr.Status.LargeMessageStore == nil || !reflect.DeepEqual(cr.Status.Bus, bus.Spec) || !reflect.DeepEqual(cr.Status.LargeMessageStore, lms.Spec) {
 				mgr := newIndexerClusterPodManager(scopedLog, cr, namespaceScopedSecret, splclient.NewSplunkClient)
 				err = mgr.handlePullBusChange(ctx, cr, busCopy, lmsCopy, client)
 				if err != nil {

pkg/splunk/enterprise/ingestorcluster.go

@@ -72,10 +72,6 @@ func ApplyIngestorCluster(ctx context.Context, client client.Client, cr *enterpr
 	// Update the CR Status
 	defer updateCRStatus(ctx, client, cr, &err)
 
-	if cr.Status.Replicas < cr.Spec.Replicas {
-		cr.Status.Bus = &enterpriseApi.BusSpec{}
-		cr.Status.LargeMessageStore = &enterpriseApi.LargeMessageStoreSpec{}
-	}
 	cr.Status.Replicas = cr.Spec.Replicas
 
 	// If needed, migrate the app framework status
@@ -260,7 +256,7 @@ func ApplyIngestorCluster(ctx context.Context, client client.Client, cr *enterpr
 		}
 
 		// If bus is updated
-		if !reflect.DeepEqual(cr.Status.Bus, bus.Spec) || !reflect.DeepEqual(cr.Status.LargeMessageStore, lms.Spec) {
+		if cr.Status.Bus == nil || cr.Status.LargeMessageStore == nil || !reflect.DeepEqual(cr.Status.Bus, bus.Spec) || !reflect.DeepEqual(cr.Status.LargeMessageStore, lms.Spec) {
 			mgr := newIngestorClusterPodManager(scopedLog, cr, namespaceScopedSecret, splclient.NewSplunkClient, client)
 			err = mgr.handlePushBusChange(ctx, cr, busCopy, lmsCopy, client)
 			if err != nil {