test

Author: kasiakoziol

pkg/splunk/enterprise/ingestorcluster.go

@@ -72,6 +72,7 @@ func ApplyIngestorCluster(ctx context.Context, client client.Client, cr *enterpr
 	// Update the CR Status
 	defer updateCRStatus(ctx, client, cr, &err)
 
+	scopedLog.Info("TestKasia", "cr.Status.Replicas < cr.Spec.Replicas", cr.Status.Replicas < cr.Spec.Replicas)
 	if cr.Status.Replicas < cr.Spec.Replicas {
 		cr.Status.BusConfiguration = enterpriseApi.BusConfigurationSpec{}
 	}
@@ -208,6 +209,7 @@ func ApplyIngestorCluster(ctx context.Context, client client.Client, cr *enterpr
 	}
 	cr.Status.Phase = phase
 
+	scopedLog.Info("TestKasia", "cr.Status.Phase == enterpriseApi.PhaseReady", cr.Status.Phase == enterpriseApi.PhaseReady)
 	// No need to requeue if everything is ready
 	if cr.Status.Phase == enterpriseApi.PhaseReady {
 		// Bus config
@@ -225,7 +227,9 @@ func ApplyIngestorCluster(ctx context.Context, client client.Client, cr *enterpr
 				return result, err
 			}
 		}
+		scopedLog.Info("TestKasia", "busConfig", busConfig)
 
+		scopedLog.Info("TestKasia", "!reflect.DeepEqual(cr.Status.BusConfiguration, busConfig.Spec)", !reflect.DeepEqual(cr.Status.BusConfiguration, busConfig.Spec))
 		// If bus config is updated
 		if !reflect.DeepEqual(cr.Status.BusConfiguration, busConfig.Spec) {
 			mgr := newIngestorClusterPodManager(scopedLog, cr, namespaceScopedSecret, splclient.NewSplunkClient)
@@ -312,7 +316,7 @@ func getIngestorStatefulSet(ctx context.Context, client splcommon.ControllerClie
 // Checks if only Bus or Pipeline config changed, and updates the conf file if so
 func (mgr *ingestorClusterPodManager) handlePushBusChange(ctx context.Context, newCR *enterpriseApi.IngestorCluster, busConfig enterpriseApi.BusConfiguration, k8s client.Client) error {
 	// Only update config for pods that exist
-	readyReplicas := newCR.Status.ReadyReplicas
+	readyReplicas := newCR.Status.Replicas
 
 	// List all pods for this IngestorCluster StatefulSet
 	var updateErr error

test/index_and_ingestion_separation/index_and_ingestion_separation_test.go

@@ -372,25 +372,29 @@ var _ = Describe("indingsep test", func() {
 			testcaseEnvInst.Log.Info("Ensure that Indexer Cluster is in Ready phase")
 			testenv.SingleSiteIndexersReady(ctx, deployment, testcaseEnvInst)
 
-			// Get instance of current Ingestor Cluster CR with latest config
-			testcaseEnvInst.Log.Info("Get instance of current Ingestor Cluster CR with latest config")
-			ingest := &enterpriseApi.IngestorCluster{}
-			err = deployment.GetInstance(ctx, deployment.GetName()+"-ingest", ingest)
-			Expect(err).To(Succeed(), "Failed to get instance of Ingestor Cluster")
-
-			// Update instance of Ingestor Cluster CR with new bus configuration
-			testcaseEnvInst.Log.Info("Update instance of Ingestor Cluster CR with new bus configuration")
-			ingest.Spec.BusConfigurationRef = v1.ObjectReference{Name: bc.Name}
-			err = deployment.UpdateCR(ctx, ingest)
-			Expect(err).To(Succeed(), "Unable to deploy Ingestor Cluster with updated CR")
+			// Get instance of current Bus Configuration CR with latest config
+			testcaseEnvInst.Log.Info("Get instance of current Bus Configuration CR with latest config")
+			bus := &enterpriseApi.BusConfiguration{}
+			err = deployment.GetInstance(ctx, bc.Name, bus)
+			Expect(err).To(Succeed(), "Failed to get instance of Bus Configuration")
+
+			// Update instance of BusConfiguration CR with new bus configuration
+			testcaseEnvInst.Log.Info("Update instance of BusConfiguration CR with new bus configuration")
+			bus.Spec = updateBus
+			err = deployment.UpdateCR(ctx, bus)
+			Expect(err).To(Succeed(), "Unable to deploy Bus Configuration with updated CR")
 
 			// Ensure that Ingestor Cluster has not been restarted
 			testcaseEnvInst.Log.Info("Ensure that Ingestor Cluster has not been restarted")
 			testenv.IngestorReady(ctx, deployment, testcaseEnvInst)
 
+			// Ensure that Indexer Cluster has not been restarted
+			testcaseEnvInst.Log.Info("Ensure that Indexer Cluster has not been restarted")
+			testenv.SingleSiteIndexersReady(ctx, deployment, testcaseEnvInst)
+
 			// Get instance of current Ingestor Cluster CR with latest config
 			testcaseEnvInst.Log.Info("Get instance of current Ingestor Cluster CR with latest config")
-			ingest = &enterpriseApi.IngestorCluster{}
+			ingest := &enterpriseApi.IngestorCluster{}
 			err = deployment.GetInstance(ctx, deployment.GetName()+"-ingest", ingest)
 			Expect(err).To(Succeed(), "Failed to get instance of Ingestor Cluster")
 
@@ -404,22 +408,6 @@ var _ = Describe("indingsep test", func() {
 			err = deployment.GetInstance(ctx, deployment.GetName()+"-idxc", index)
 			Expect(err).To(Succeed(), "Failed to get instance of Indexer Cluster")
 
-			// Update instance of Indexer Cluster CR with new bus configuration
-			testcaseEnvInst.Log.Info("Update instance of Indexer Cluster CR with new bus configuration")
-			index.Spec.BusConfigurationRef = v1.ObjectReference{Name: bc.Name}
-			err = deployment.UpdateCR(ctx, index)
-			Expect(err).To(Succeed(), "Unable to deploy Indexer Cluster with updated CR")
-
-			// Ensure that Indexer Cluster has not been restarted
-			testcaseEnvInst.Log.Info("Ensure that Indexer Cluster has not been restarted")
-			testenv.SingleSiteIndexersReady(ctx, deployment, testcaseEnvInst)
-
-			// Get instance of current Indexer Cluster CR with latest config
-			testcaseEnvInst.Log.Info("Get instance of current Indexer Cluster CR with latest config")
-			index = &enterpriseApi.IndexerCluster{}
-			err = deployment.GetInstance(ctx, deployment.GetName()+"-idxc", index)
-			Expect(err).To(Succeed(), "Failed to get instance of Indexer Cluster")
-
 			// Verify Indexer Cluster Status
 			testcaseEnvInst.Log.Info("Verify Indexer Cluster Status")
 			Expect(index.Status.BusConfiguration).To(Equal(updateBus), "Indexer bus configuration status is not the same as provided as input")
@@ -468,12 +456,6 @@ var _ = Describe("indingsep test", func() {
 				}
 			}
 
-			// Get instance of current Indexer Cluster CR with latest config
-			testcaseEnvInst.Log.Info("Get instance of current Indexer Cluster CR with latest config")
-			index = &enterpriseApi.IndexerCluster{}
-			err = deployment.GetInstance(ctx, deployment.GetName()+"-idxc", index)
-			Expect(err).To(Succeed(), "Failed to get instance of Indexer Cluster")
-
 			// Verify conf files
 			testcaseEnvInst.Log.Info("Verify conf files")
 			pods = testenv.DumpGetPods(deployment.GetName())