CSPL-3551 Fixes

Author: kasiakoziol

pkg/splunk/enterprise/afwscheduler.go

@@ -55,7 +55,7 @@ var appPhaseInfoStatuses = map[enterpriseApi.AppPhaseStatusType]bool{
 // isFanOutApplicableToCR confirms if a given CR needs fanOut support
 func isFanOutApplicableToCR(cr splcommon.MetaObject) bool {
 	switch cr.GetObjectKind().GroupVersionKind().Kind {
-	case "Standalone":
+	case "Standalone", "IngestorCluster":
 		return true
 	default:
 		return false
@@ -1514,6 +1514,8 @@ func afwGetReleventStatefulsetByKind(ctx context.Context, cr splcommon.MetaObjec
 		instanceID = SplunkClusterManager
 	case "MonitoringConsole":
 		instanceID = SplunkMonitoringConsole
+	case "IngestorCluster":
+		instanceID = SplunkIngestor
 	default:
 		return nil
 	}
@@ -2175,6 +2177,7 @@ func afwSchedulerEntry(ctx context.Context, client splcommon.ControllerClient, c
 
 		podExecClient := splutil.GetPodExecClient(client, cr, podName)
 		appsPathOnPod := filepath.Join(appBktMnt, appSrcName)
+
 		// create the dir on Splunk pod/s where app/s will be copied from operator pod
 		err = createDirOnSplunkPods(ctx, cr, *sts.Spec.Replicas, appsPathOnPod, podExecClient)
 		if err != nil {

pkg/splunk/enterprise/finalizers.go

@@ -56,6 +56,8 @@ func DeleteSplunkPvc(ctx context.Context, cr splcommon.MetaObject, c splcommon.C
 		components = append(components, splcommon.ClusterManager)
 	case "MonitoringConsole":
 		components = append(components, "monitoring-console")
+	case "IngestorCluster":
+		components = append(components, "ingestor")
 	default:
 		scopedLog.Info("Skipping PVC removal")
 		return nil

pkg/splunk/enterprise/ingestorcluster.go

@@ -214,7 +214,6 @@ func ApplyIngestorCluster(ctx context.Context, client client.Client, cr *enterpr
 
 	// No need to requeue if everything is ready
 	if cr.Status.Phase == enterpriseApi.PhaseReady {
-		// TODO: Make it work when HPA scales replicas - all new pods should get the configuration
 		_, err = handlePushBusOrPipelineConfigChange(ctx, cr, client)
 		if err != nil {
 			scopedLog.Error(err, "Failed to update conf file for PushBus/Pipeline config change after pod creation")
@@ -264,8 +263,8 @@ func ApplyIngestorCluster(ctx context.Context, client client.Client, cr *enterpr
 // validateIngestorClusterSpec checks validity and makes default updates to a IngestorClusterSpec and returns error if something is wrong
 func validateIngestorClusterSpec(ctx context.Context, c splcommon.ControllerClient, cr *enterpriseApi.IngestorCluster) error {
 	// We cannot have 0 replicas in IngestorCluster spec since this refers to number of ingestion pods in an ingestor cluster
-	if cr.Spec.Replicas == 0 {
-		cr.Spec.Replicas = 1
+	if cr.Spec.Replicas < 3 {
+		cr.Spec.Replicas = 3
 	}
 
 	if !reflect.DeepEqual(cr.Status.AppContext.AppFrameworkConfig, cr.Spec.AppFrameworkConfig) {
@@ -280,7 +279,15 @@ func validateIngestorClusterSpec(ctx context.Context, c splcommon.ControllerClie
 
 // getIngestorStatefulSet returns a Kubernetes StatefulSet object for Splunk Enterprise ingestors
 func getIngestorStatefulSet(ctx context.Context, client splcommon.ControllerClient, cr *enterpriseApi.IngestorCluster) (*appsv1.StatefulSet, error) {
-	return getSplunkStatefulSet(ctx, client, cr, &cr.Spec.CommonSplunkSpec, SplunkIngestor, cr.Spec.Replicas, make([]corev1.EnvVar, 0))
+	ss, err := getSplunkStatefulSet(ctx, client, cr, &cr.Spec.CommonSplunkSpec, SplunkIngestor, cr.Spec.Replicas, []corev1.EnvVar{})
+	if err != nil {
+		return nil, err
+	}
+
+	// Setup App framework staging volume for apps
+	setupAppsStagingVolume(ctx, client, cr, &ss.Spec.Template, &cr.Spec.AppFrameworkConfig)
+
+	return ss, nil
 }
 
 // Checks if only PushBus or Pipeline config changed, and updates the conf file if so

pkg/splunk/util/util.go

@@ -259,7 +259,7 @@ func (podExecClient *PodExecClient) RunPodExecCommand(ctx context.Context, strea
 	if err != nil {
 		errmsg = err.Error()
 	}
-	reqLogger.Info("podexec call returned", "cmd", strings.Join(baseCmd, " "), "stdout", stdOut, "stderr", stdErr, "err", errmsg)
+	reqLogger.Info("podexec call returned", "cmd", strings.Join(baseCmd, " "), "stdout", stdOut, "stderr", stdErr, "err", errmsg, "podExecClient", podExecClient)
 
 	// Note: splunk 9.0 throws a few harmless warning error messages, suppress it!
 	suppressHarmlessErrorMessages(&stdErr, &stdOut)