CSPL-3704 Fix failing tests

kasiakoziol · kasiakoziol · commit 5a0389dffc5a · 2025-05-12T11:36:35.000+02:00
diff --git a/pkg/splunk/enterprise/clustermanager.go b/pkg/splunk/enterprise/clustermanager.go
@@ -129,7 +129,9 @@ func ApplyClusterManager(ctx context.Context, client splcommon.ControllerClient,
 	}
 
 	// Smart Store secrets get created manually and should not be managed by the Operator
-	DeleteOwnerReferencesForResources(ctx, client, cr, &cr.Spec.SmartStore, SplunkClusterManager)
+	if &cr.Spec.SmartStore != nil {
+		_ = DeleteOwnerReferencesForS3SecretObjects(ctx, client, cr, &cr.Spec.SmartStore)
+	}
 
 	// check if deletion has been requested
 	if cr.ObjectMeta.DeletionTimestamp != nil {
@@ -141,6 +143,8 @@ func ApplyClusterManager(ctx context.Context, client splcommon.ControllerClient,
 			}
 		}
 
+		DeleteOwnerReferencesForResources(ctx, client, cr, SplunkClusterManager)
+
 		// If this is the last of its kind getting deleted,
 		// remove the entry for this CR type from configMap or else
 		// just decrement the refCount for this CR type.
diff --git a/pkg/splunk/enterprise/clustermaster.go b/pkg/splunk/enterprise/clustermaster.go
@@ -126,7 +126,9 @@ func ApplyClusterMaster(ctx context.Context, client splcommon.ControllerClient,
 	}
 
 	// Smart Store secrets get created manually and should not be managed by the Operator
-	DeleteOwnerReferencesForResources(ctx, client, cr, &cr.Spec.SmartStore, SplunkClusterMaster)
+	if &cr.Spec.SmartStore != nil {
+		_ = DeleteOwnerReferencesForS3SecretObjects(ctx, client, cr, &cr.Spec.SmartStore)
+	}
 
 	// check if deletion has been requested
 	if cr.ObjectMeta.DeletionTimestamp != nil {
@@ -138,6 +140,8 @@ func ApplyClusterMaster(ctx context.Context, client splcommon.ControllerClient,
 			}
 		}
 
+		DeleteOwnerReferencesForResources(ctx, client, cr, SplunkClusterMaster)
+
 		// If this is the last of its kind getting deleted,
 		// remove the entry for this CR type from configMap or else
 		// just decrement the refCount for this CR type.
@@ -147,7 +151,7 @@ func ApplyClusterMaster(ctx context.Context, client splcommon.ControllerClient,
 				return result, err
 			}
 		}
-		
+
 		terminating, err := splctrl.CheckForDeletion(ctx, cr, client)
 		if terminating && err != nil { // don't bother if no error, since it will just be removed immmediately after
 			cr.Status.Phase = enterpriseApi.PhaseTerminating
diff --git a/pkg/splunk/enterprise/indexercluster.go b/pkg/splunk/enterprise/indexercluster.go
@@ -125,11 +125,9 @@ func ApplyIndexerClusterManager(ctx context.Context, client splcommon.Controller
 		}
 	}
 
-	// Smart Store secrets get created manually and should not be managed by the Operator
-	DeleteOwnerReferencesForResources(ctx, client, cr, nil, SplunkIndexer)
-
 	// check if deletion has been requested
 	if cr.ObjectMeta.DeletionTimestamp != nil {
+		DeleteOwnerReferencesForResources(ctx, client, cr, SplunkIndexer)
 
 		terminating, err := splctrl.CheckForDeletion(ctx, cr, client)
 		if terminating && err != nil { // don't bother if no error, since it will just be removed immmediately after
@@ -382,11 +380,10 @@ func ApplyIndexerCluster(ctx context.Context, client splcommon.ControllerClient,
 		}
 	}
 
-	// Smart Store secrets get created manually and should not be managed by the Operator
-	DeleteOwnerReferencesForResources(ctx, client, cr, nil, SplunkIndexer)
-
 	// check if deletion has been requested
 	if cr.ObjectMeta.DeletionTimestamp != nil {
+		DeleteOwnerReferencesForResources(ctx, client, cr, SplunkIndexer)
+
 		terminating, err := splctrl.CheckForDeletion(ctx, cr, client)
 		if terminating && err != nil { // don't bother if no error, since it will just be removed immmediately after
 			cr.Status.Phase = enterpriseApi.PhaseTerminating
diff --git a/pkg/splunk/enterprise/licensemanager.go b/pkg/splunk/enterprise/licensemanager.go
@@ -90,9 +90,6 @@ func ApplyLicenseManager(ctx context.Context, client splcommon.ControllerClient,
 		return result, err
 	}
 
-	// Smart Store secrets get created manually and should not be managed by the Operator
-	DeleteOwnerReferencesForResources(ctx, client, cr, nil, SplunkLicenseManager)
-
 	// check if deletion has been requested
 	if cr.ObjectMeta.DeletionTimestamp != nil {
 		if cr.Spec.MonitoringConsoleRef.Name != "" {
@@ -101,6 +98,8 @@ func ApplyLicenseManager(ctx context.Context, client splcommon.ControllerClient,
 				return result, err
 			}
 		}
+		DeleteOwnerReferencesForResources(ctx, client, cr, SplunkLicenseManager)
+
 		// If this is the last of its kind getting deleted,
 		// remove the entry for this CR type from configMap or else
 		// just decrement the refCount for this CR type.
diff --git a/pkg/splunk/enterprise/licensemaster.go b/pkg/splunk/enterprise/licensemaster.go
@@ -90,9 +90,6 @@ func ApplyLicenseMaster(ctx context.Context, client splcommon.ControllerClient,
 		return result, err
 	}
 
-	// Smart Store secrets get created manually and should not be managed by the Operator
-	DeleteOwnerReferencesForResources(ctx, client, cr, nil, SplunkLicenseMaster)
-
 	// check if deletion has been requested
 	if cr.ObjectMeta.DeletionTimestamp != nil {
 		if cr.Spec.MonitoringConsoleRef.Name != "" {
@@ -101,6 +98,9 @@ func ApplyLicenseMaster(ctx context.Context, client splcommon.ControllerClient,
 				return result, err
 			}
 		}
+
+		DeleteOwnerReferencesForResources(ctx, client, cr, SplunkLicenseMaster)
+
 		// If this is the last of its kind getting deleted,
 		// remove the entry for this CR type from configMap or else
 		// just decrement the refCount for this CR type.
diff --git a/pkg/splunk/enterprise/searchheadcluster.go b/pkg/splunk/enterprise/searchheadcluster.go
@@ -112,9 +112,6 @@ func ApplySearchHeadCluster(ctx context.Context, client splcommon.ControllerClie
 		cr.Status.AdminPasswordChangedSecrets = make(map[string]bool)
 	}
 
-	// Smart Store secrets get created manually and should not be managed by the Operator
-	DeleteOwnerReferencesForResources(ctx, client, cr, nil, SplunkSearchHead)
-
 	// check if deletion has been requested
 	if cr.ObjectMeta.DeletionTimestamp != nil {
 		if cr.Spec.MonitoringConsoleRef.Name != "" {
@@ -124,6 +121,8 @@ func ApplySearchHeadCluster(ctx context.Context, client splcommon.ControllerClie
 			}
 		}
 
+		DeleteOwnerReferencesForResources(ctx, client, cr, SplunkSearchHead)
+
 		// If this is the last of its kind getting deleted,
 		// remove the entry for this CR type from configMap or else
 		// just decrement the refCount for this CR type.
diff --git a/pkg/splunk/enterprise/standalone.go b/pkg/splunk/enterprise/standalone.go
@@ -115,7 +115,9 @@ func ApplyStandalone(ctx context.Context, client splcommon.ControllerClient, cr
 	}
 
 	// Smart Store secrets get created manually and should not be managed by the Operator
-	DeleteOwnerReferencesForResources(ctx, client, cr, &cr.Spec.SmartStore, SplunkStandalone)
+	if &cr.Spec.SmartStore != nil {
+		_ = DeleteOwnerReferencesForS3SecretObjects(ctx, client, cr, &cr.Spec.SmartStore)
+	}
 
 	// check if deletion has been requested
 	if cr.ObjectMeta.DeletionTimestamp != nil {
@@ -126,6 +128,9 @@ func ApplyStandalone(ctx context.Context, client splcommon.ControllerClient, cr
 				return result, err
 			}
 		}
+
+		DeleteOwnerReferencesForResources(ctx, client, cr, SplunkStandalone)
+
 		// If this is the last of its kind getting deleted,
 		// remove the entry for this CR type from configMap or else
 		// just decrement the refCount for this CR type.
diff --git a/pkg/splunk/enterprise/util.go b/pkg/splunk/enterprise/util.go
@@ -786,15 +786,11 @@ func setupInitContainer(podTemplateSpec *corev1.PodTemplateSpec, Image string, i
 
 // DeleteOwnerReferencesForResources used to delete any outstanding owner references
 // Ideally we should be removing the owner reference wherever the CR is not controller for the resource
-func DeleteOwnerReferencesForResources(ctx context.Context, client splcommon.ControllerClient, cr splcommon.MetaObject, smartstore *enterpriseApi.SmartStoreSpec, instanceType InstanceType) error {
+func DeleteOwnerReferencesForResources(ctx context.Context, client splcommon.ControllerClient, cr splcommon.MetaObject, instanceType InstanceType) error {
 	var err error
 	reqLogger := log.FromContext(ctx)
 	scopedLog := reqLogger.WithName("DeleteOwnerReferencesForResources").WithValues("kind", cr.GetObjectKind().GroupVersionKind().Kind, "name", cr.GetName(), "namespace", cr.GetNamespace())
 
-	if smartstore != nil {
-		_ = DeleteOwnerReferencesForS3SecretObjects(ctx, client, cr, smartstore)
-	}
-
 	// Delete references to Default secret object
 	defaultSecretName := splcommon.GetNamespaceScopedSecretName(cr.GetNamespace())
 	_, err = splutil.RemoveSecretOwnerRef(ctx, client, defaultSecretName, cr)
diff --git a/pkg/splunk/enterprise/util_test.go b/pkg/splunk/enterprise/util_test.go
@@ -566,7 +566,7 @@ func TestRemoveOwenerReferencesForSecretObjectsReferredBySmartstoreVolumes(t *te
 	}
 
 	// Smartstore volume config with non-existing secret objects
-	err = DeleteOwnerReferencesForResources(ctx, client, &cr, &cr.Spec.SmartStore, SplunkClusterMaster)
+	err = DeleteOwnerReferencesForResources(ctx, client, &cr, SplunkClusterMaster)
 	if err == nil {
 		t.Errorf("Should report an error, when the secret objects doesn't exist")
 	}

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,9 @@ func ApplyClusterManager(ctx context.Context, client splcommon.ControllerClient,`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`// Smart Store secrets get created manually and should not be managed by the Operator`
`132`		`- DeleteOwnerReferencesForResources(ctx, client, cr, &cr.Spec.SmartStore, SplunkClusterManager)`
	`132`	`+ if &cr.Spec.SmartStore != nil {`
	`133`	`+ _ = DeleteOwnerReferencesForS3SecretObjects(ctx, client, cr, &cr.Spec.SmartStore)`
	`134`	`+ }`
`133`	`135`
`134`	`136`	`// check if deletion has been requested`
`135`	`137`	`if cr.ObjectMeta.DeletionTimestamp != nil {`
`@@ -141,6 +143,8 @@ func ApplyClusterManager(ctx context.Context, client splcommon.ControllerClient,`
`141`	`143`	`}`
`142`	`144`	`}`
`143`	`145`
	`146`	`+ DeleteOwnerReferencesForResources(ctx, client, cr, SplunkClusterManager)`
	`147`	`+`
`144`	`148`	`// If this is the last of its kind getting deleted,`
`145`	`149`	`// remove the entry for this CR type from configMap or else`
`146`	`150`	`// just decrement the refCount for this CR type.`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,9 @@ func ApplyClusterMaster(ctx context.Context, client splcommon.ControllerClient,`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`// Smart Store secrets get created manually and should not be managed by the Operator`
`129`		`- DeleteOwnerReferencesForResources(ctx, client, cr, &cr.Spec.SmartStore, SplunkClusterMaster)`
	`129`	`+ if &cr.Spec.SmartStore != nil {`
	`130`	`+ _ = DeleteOwnerReferencesForS3SecretObjects(ctx, client, cr, &cr.Spec.SmartStore)`
	`131`	`+ }`
`130`	`132`
`131`	`133`	`// check if deletion has been requested`
`132`	`134`	`if cr.ObjectMeta.DeletionTimestamp != nil {`
`@@ -138,6 +140,8 @@ func ApplyClusterMaster(ctx context.Context, client splcommon.ControllerClient,`
`138`	`140`	`}`
`139`	`141`	`}`
`140`	`142`
	`143`	`+ DeleteOwnerReferencesForResources(ctx, client, cr, SplunkClusterMaster)`
	`144`	`+`
`141`	`145`	`// If this is the last of its kind getting deleted,`
`142`	`146`	`// remove the entry for this CR type from configMap or else`
`143`	`147`	`// just decrement the refCount for this CR type.`
`@@ -147,7 +151,7 @@ func ApplyClusterMaster(ctx context.Context, client splcommon.ControllerClient,`
`147`	`151`	`return result, err`
`148`	`152`	`}`
`149`	`153`	`}`
`150`		`-`
	`154`	`+`
`151`	`155`	`terminating, err := splctrl.CheckForDeletion(ctx, cr, client)`
`152`	`156`	`if terminating && err != nil { // don't bother if no error, since it will just be removed immmediately after`
`153`	`157`	`cr.Status.Phase = enterpriseApi.PhaseTerminating`
Original file line number	Diff line number	Diff line change
`@@ -125,11 +125,9 @@ func ApplyIndexerClusterManager(ctx context.Context, client splcommon.Controller`
`125`	`125`	`}`
`126`	`126`	`}`
`127`	`127`
`128`		`- // Smart Store secrets get created manually and should not be managed by the Operator`
`129`		`- DeleteOwnerReferencesForResources(ctx, client, cr, nil, SplunkIndexer)`
`130`		`-`
`131`	`128`	`// check if deletion has been requested`
`132`	`129`	`if cr.ObjectMeta.DeletionTimestamp != nil {`
	`130`	`+ DeleteOwnerReferencesForResources(ctx, client, cr, SplunkIndexer)`
`133`	`131`
`134`	`132`	`terminating, err := splctrl.CheckForDeletion(ctx, cr, client)`
`135`	`133`	`if terminating && err != nil { // don't bother if no error, since it will just be removed immmediately after`
`@@ -382,11 +380,10 @@ func ApplyIndexerCluster(ctx context.Context, client splcommon.ControllerClient,`
`382`	`380`	`}`
`383`	`381`	`}`
`384`	`382`
`385`		`- // Smart Store secrets get created manually and should not be managed by the Operator`
`386`		`- DeleteOwnerReferencesForResources(ctx, client, cr, nil, SplunkIndexer)`
`387`		`-`
`388`	`383`	`// check if deletion has been requested`
`389`	`384`	`if cr.ObjectMeta.DeletionTimestamp != nil {`
	`385`	`+ DeleteOwnerReferencesForResources(ctx, client, cr, SplunkIndexer)`
	`386`	`+`
`390`	`387`	`terminating, err := splctrl.CheckForDeletion(ctx, cr, client)`
`391`	`388`	`if terminating && err != nil { // don't bother if no error, since it will just be removed immmediately after`
`392`	`389`	`cr.Status.Phase = enterpriseApi.PhaseTerminating`
Original file line number	Diff line number	Diff line change
`@@ -90,9 +90,6 @@ func ApplyLicenseManager(ctx context.Context, client splcommon.ControllerClient,`
`90`	`90`	`return result, err`
`91`	`91`	`}`
`92`	`92`
`93`		`- // Smart Store secrets get created manually and should not be managed by the Operator`
`94`		`- DeleteOwnerReferencesForResources(ctx, client, cr, nil, SplunkLicenseManager)`
`95`		`-`
`96`	`93`	`// check if deletion has been requested`
`97`	`94`	`if cr.ObjectMeta.DeletionTimestamp != nil {`
`98`	`95`	`if cr.Spec.MonitoringConsoleRef.Name != "" {`
`@@ -101,6 +98,8 @@ func ApplyLicenseManager(ctx context.Context, client splcommon.ControllerClient,`
`101`	`98`	`return result, err`
`102`	`99`	`}`
`103`	`100`	`}`
	`101`	`+ DeleteOwnerReferencesForResources(ctx, client, cr, SplunkLicenseManager)`
	`102`	`+`
`104`	`103`	`// If this is the last of its kind getting deleted,`
`105`	`104`	`// remove the entry for this CR type from configMap or else`
`106`	`105`	`// just decrement the refCount for this CR type.`
Original file line number	Diff line number	Diff line change
`@@ -90,9 +90,6 @@ func ApplyLicenseMaster(ctx context.Context, client splcommon.ControllerClient,`
`90`	`90`	`return result, err`
`91`	`91`	`}`
`92`	`92`
`93`		`- // Smart Store secrets get created manually and should not be managed by the Operator`
`94`		`- DeleteOwnerReferencesForResources(ctx, client, cr, nil, SplunkLicenseMaster)`
`95`		`-`
`96`	`93`	`// check if deletion has been requested`
`97`	`94`	`if cr.ObjectMeta.DeletionTimestamp != nil {`
`98`	`95`	`if cr.Spec.MonitoringConsoleRef.Name != "" {`
`@@ -101,6 +98,9 @@ func ApplyLicenseMaster(ctx context.Context, client splcommon.ControllerClient,`
`101`	`98`	`return result, err`
`102`	`99`	`}`
`103`	`100`	`}`
	`101`	`+`
	`102`	`+ DeleteOwnerReferencesForResources(ctx, client, cr, SplunkLicenseMaster)`
	`103`	`+`
`104`	`104`	`// If this is the last of its kind getting deleted,`
`105`	`105`	`// remove the entry for this CR type from configMap or else`
`106`	`106`	`// just decrement the refCount for this CR type.`
Original file line number	Diff line number	Diff line change
`@@ -112,9 +112,6 @@ func ApplySearchHeadCluster(ctx context.Context, client splcommon.ControllerClie`
`112`	`112`	`cr.Status.AdminPasswordChangedSecrets = make(map[string]bool)`
`113`	`113`	`}`
`114`	`114`
`115`		`- // Smart Store secrets get created manually and should not be managed by the Operator`
`116`		`- DeleteOwnerReferencesForResources(ctx, client, cr, nil, SplunkSearchHead)`
`117`		`-`
`118`	`115`	`// check if deletion has been requested`
`119`	`116`	`if cr.ObjectMeta.DeletionTimestamp != nil {`
`120`	`117`	`if cr.Spec.MonitoringConsoleRef.Name != "" {`
`@@ -124,6 +121,8 @@ func ApplySearchHeadCluster(ctx context.Context, client splcommon.ControllerClie`
`124`	`121`	`}`
`125`	`122`	`}`
`126`	`123`
	`124`	`+ DeleteOwnerReferencesForResources(ctx, client, cr, SplunkSearchHead)`
	`125`	`+`
`127`	`126`	`// If this is the last of its kind getting deleted,`
`128`	`127`	`// remove the entry for this CR type from configMap or else`
`129`	`128`	`// just decrement the refCount for this CR type.`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,9 @@ func ApplyStandalone(ctx context.Context, client splcommon.ControllerClient, cr`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`// Smart Store secrets get created manually and should not be managed by the Operator`
`118`		`- DeleteOwnerReferencesForResources(ctx, client, cr, &cr.Spec.SmartStore, SplunkStandalone)`
	`118`	`+ if &cr.Spec.SmartStore != nil {`
	`119`	`+ _ = DeleteOwnerReferencesForS3SecretObjects(ctx, client, cr, &cr.Spec.SmartStore)`
	`120`	`+ }`
`119`	`121`
`120`	`122`	`// check if deletion has been requested`
`121`	`123`	`if cr.ObjectMeta.DeletionTimestamp != nil {`
`@@ -126,6 +128,9 @@ func ApplyStandalone(ctx context.Context, client splcommon.ControllerClient, cr`
`126`	`128`	`return result, err`
`127`	`129`	`}`
`128`	`130`	`}`
	`131`	`+`
	`132`	`+ DeleteOwnerReferencesForResources(ctx, client, cr, SplunkStandalone)`
	`133`	`+`
`129`	`134`	`// If this is the last of its kind getting deleted,`
`130`	`135`	`// remove the entry for this CR type from configMap or else`
`131`	`136`	`// just decrement the refCount for this CR type.`
Original file line number	Diff line number	Diff line change
`@@ -566,7 +566,7 @@ func TestRemoveOwenerReferencesForSecretObjectsReferredBySmartstoreVolumes(t *te`
`566`	`566`	`}`
`567`	`567`
`568`	`568`	`// Smartstore volume config with non-existing secret objects`
`569`		`- err = DeleteOwnerReferencesForResources(ctx, client, &cr, &cr.Spec.SmartStore, SplunkClusterMaster)`
	`569`	`+ err = DeleteOwnerReferencesForResources(ctx, client, &cr, SplunkClusterMaster)`
`570`	`570`	`if err == nil {`
`571`	`571`	`t.Errorf("Should report an error, when the secret objects doesn't exist")`
`572`	`572`	`}`