Only ignore IsNotFound k8s errors, and return any other error we may get

humio · Jan 30, 2024 · 12c3466 · 12c3466
1 parent 41389eb
commit 12c3466
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/controllers/humioingesttoken_controller.go b/controllers/humioingesttoken_controller.go
@@ -190,8 +190,11 @@ func (r *HumioIngestTokenReconciler) SetupWithManager(mgr ctrl.Manager) error {
 
 func (r *HumioIngestTokenReconciler) finalize(ctx context.Context, config *humioapi.Config, req reconcile.Request, hit *humiov1alpha1.HumioIngestToken) error {
 	_, err := helpers.NewCluster(ctx, r, hit.Spec.ManagedClusterName, hit.Spec.ExternalClusterName, hit.Namespace, helpers.UseCertManager(), true)
-	if k8serrors.IsNotFound(err) {
-		return nil
+	if err != nil {
+		if k8serrors.IsNotFound(err) {
+			return nil
+		}
+		return err
 	}
 
 	return r.HumioClient.DeleteIngestToken(config, req, hit)

diff --git a/controllers/humioparser_controller.go b/controllers/humioparser_controller.go
@@ -195,8 +195,11 @@ func (r *HumioParserReconciler) SetupWithManager(mgr ctrl.Manager) error {
 
 func (r *HumioParserReconciler) finalize(ctx context.Context, config *humioapi.Config, req reconcile.Request, hp *humiov1alpha1.HumioParser) error {
 	_, err := helpers.NewCluster(ctx, r, hp.Spec.ManagedClusterName, hp.Spec.ExternalClusterName, hp.Namespace, helpers.UseCertManager(), true)
-	if k8serrors.IsNotFound(err) {
-		return nil
+	if err != nil {
+		if k8serrors.IsNotFound(err) {
+			return nil
+		}
+		return err
 	}
 
 	return r.HumioClient.DeleteParser(config, req, hp)

diff --git a/controllers/humiorepository_controller.go b/controllers/humiorepository_controller.go
@@ -191,8 +191,11 @@ func (r *HumioRepositoryReconciler) SetupWithManager(mgr ctrl.Manager) error {
 
 func (r *HumioRepositoryReconciler) finalize(ctx context.Context, config *humioapi.Config, req reconcile.Request, hr *humiov1alpha1.HumioRepository) error {
 	_, err := helpers.NewCluster(ctx, r, hr.Spec.ManagedClusterName, hr.Spec.ExternalClusterName, hr.Namespace, helpers.UseCertManager(), true)
-	if k8serrors.IsNotFound(err) {
-		return nil
+	if err != nil {
+		if k8serrors.IsNotFound(err) {
+			return nil
+		}
+		return err
 	}
 
 	return r.HumioClient.DeleteRepository(config, req, hr)