test

Author: kasiakoziol

pkg/splunk/client/enterprise.go

@@ -27,6 +27,7 @@ import (
 	"time"
 
 	splcommon "github.com/splunk/splunk-operator/pkg/splunk/common"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 )
 
 // SplunkHTTPClient defines the interface used by SplunkClient.
@@ -946,31 +947,44 @@ func (c *SplunkClient) RestartSplunk() error {
 // Updates conf files and their properties
 // See https://help.splunk.com/en/splunk-enterprise/leverage-rest-apis/rest-api-reference/10.0/configuration-endpoints/configuration-endpoint-descriptions
 func (c *SplunkClient) UpdateConfFile(fileName, property, key, value string) error {
+	logger := logf.Log.WithName("UpdateConfFile")
+	logger.V(1).Info("Creating/ensuring object in conf file", "fileName", fileName, "property", property)
+
 	// Creates an object in a conf file if it doesn't exist
 	endpoint := fmt.Sprintf("%s/servicesNS/nobody/system/configs/conf-%s", c.ManagementURI, fileName)
 	body := fmt.Sprintf("name=%s", property)
 
+	logger.V(2).Info("POST request to create conf object", "endpoint", endpoint, "body", body)
 	request, err := http.NewRequest("POST", endpoint, strings.NewReader(body))
 	if err != nil {
+		logger.Error(err, "Failed to create HTTP request for conf object creation", "endpoint", endpoint)
 		return err
 	}
 
 	expectedStatus := []int{200, 201, 409}
 	err = c.Do(request, expectedStatus, nil)
 	if err != nil {
+		logger.Error(err, "Failed to create/ensure conf object", "endpoint", endpoint, "property", property)
 		return err
 	}
 
 	// Updates a property of an object in a conf file
 	endpoint = fmt.Sprintf("%s/servicesNS/nobody/system/configs/conf-%s/%s", c.ManagementURI, fileName, property)
 	body = fmt.Sprintf("%s=%s", key, value)
 
+	logger.V(2).Info("POST request to update conf property", "endpoint", endpoint, "body", body, "key", key, "value", value)
 	request, err = http.NewRequest("POST", endpoint, strings.NewReader(body))
 	if err != nil {
+		logger.Error(err, "Failed to create HTTP request for conf property update", "endpoint", endpoint)
 		return err
 	}
 
 	expectedStatus = []int{200, 201}
 	err = c.Do(request, expectedStatus, nil)
+	if err != nil {
+		logger.Error(err, "Failed to update conf property", "endpoint", endpoint, "key", key, "value", value)
+	} else {
+		logger.V(1).Info("Successfully updated conf property", "fileName", fileName, "property", property, "key", key, "value", value)
+	}
 	return err
 }

pkg/splunk/enterprise/ingestorcluster.go

@@ -212,12 +212,17 @@ func ApplyIngestorCluster(ctx context.Context, client client.Client, cr *enterpr
 	}
 	cr.Status.Phase = phase
 
-	if oldCR.Status.ReadyReplicas == 0 && cr.Status.ReadyReplicas > 0 {
-		_, err := handlePushBusOrPipelineConfigChange(ctx, oldCR, cr, client)
-		if err != nil {
-			scopedLog.Error(err, "Failed to update conf file for PushBus/Pipeline config change after pod creation")
-			return result, err
-		}
+	if cr.Status.ReadyReplicas < cr.Spec.Replicas {
+		// Not all pods are ready, requeue to try again soon
+		result.Requeue = true
+		result.RequeueAfter = time.Second * 5
+		return result, nil
+	}
+
+	_, err = handlePushBusOrPipelineConfigChange(ctx, oldCR, cr, client)
+	if err != nil {
+		scopedLog.Error(err, "Failed to update conf file for PushBus/Pipeline config change after pod creation")
+		return result, err
 	}
 
 	// No need to requeue if everything is ready
@@ -319,18 +324,14 @@ func handlePushBusOrPipelineConfigChange(ctx context.Context, oldCR, newCR *ente
 		pushBusChangedFields, pipelineChangedFields := getChangedPushBusAndPipelineFields(oldCR, newCR)
 
 		for _, field := range pushBusChangedFields {
-			if pushBusChanged || firstCreate {
-				if err := splunkClient.UpdateConfFile("outputs", field[0], field[1], field[2]); err != nil {
-					updateErr = err
-				}
+			if err := splunkClient.UpdateConfFile("outputs", field[0], field[1], field[2]); err != nil {
+				updateErr = err
 			}
 		}
 
 		for _, field := range pipelineChangedFields {
-			if pipelineChanged || firstCreate {
-				if err := splunkClient.UpdateConfFile("default-mode", field[0], field[1], field[2]); err != nil {
-					updateErr = err
-				}
+			if err := splunkClient.UpdateConfFile("default-mode", field[0], field[1], field[2]); err != nil {
+				updateErr = err
 			}
 		}
 	}
@@ -384,7 +385,7 @@ func getChangedPushBusAndPipelineFields(oldCR, newCR *enterpriseApi.IngestorClus
 		pipelineChangedFields = append(pipelineChangedFields, []string{"pipeline:remotequeueruleset", "disabled", fmt.Sprintf("%t", newPC.RemoteQueueRuleset)})
 	}
 	if oldPC.RuleSet != newPC.RuleSet {
-		pipelineChangedFields = append(pipelineChangedFields, []string{"pipeline:remotequeueruleset", "disabled", fmt.Sprintf("%t", newPC.RuleSet)})
+		pipelineChangedFields = append(pipelineChangedFields, []string{"pipeline:ruleset", "disabled", fmt.Sprintf("%t", newPC.RuleSet)})
 	}
 	if oldPC.RemoteQueueTyping != newPC.RemoteQueueTyping {
 		pipelineChangedFields = append(pipelineChangedFields, []string{"pipeline:remotequeuetyping", "disabled", fmt.Sprintf("%t", newPC.RemoteQueueTyping)})