Commit comments

humio · Aug 9, 2024 · e26ca4f · e26ca4f
1 parent 113a84d
commit e26ca4f
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 7 deletions.
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -55,4 +55,4 @@ jobs:
         curl -Lo ./kind https://kind.sigs.k8s.io/dl/v0.22.0/kind-linux-amd64
         chmod +x ./kind
         ./kind delete cluster || true
-        make clean
+        make clean
diff --git a/config/samples/core_v1alpha1_humioaggregatealert.yaml b/config/samples/core_v1alpha1_humioaggregatealert.yaml
@@ -2,7 +2,7 @@ apiVersion: core.humio.com/v1alpha1
 kind: HumioAggregateAlert
 metadata:
   labels:
-    name: humioaggregatealert-sample
+  name: humioaggregatealert-sample
 spec:
   managedClusterName: example-humiocluster
   name: "example-aggregatealert"

diff --git a/controllers/humioaction_annotations.go b/controllers/humioaction_annotations.go
@@ -3,7 +3,6 @@ package controllers
 import (
 	"context"
 	"fmt"
-
 	humioapi "github.com/humio/cli/api"
 	humiov1alpha1 "github.com/humio/humio-operator/api/v1alpha1"
 	"github.com/humio/humio-operator/pkg/humio"

diff --git a/controllers/humiofilteralert_controller.go b/controllers/humiofilteralert_controller.go
@@ -218,5 +218,6 @@ func (r *HumioFilterAlertReconciler) logErrorAndReturn(err error, msg string) er
 }
 
 func sanitizeFilterAlert(filterAlert *humioapi.FilterAlert) {
+	filterAlert.ID = ""
 	filterAlert.RunAsUserID = ""
 }
diff --git a/controllers/humioscheduledsearch_controller.go b/controllers/humioscheduledsearch_controller.go
@@ -209,5 +209,6 @@ func (r *HumioScheduledSearchReconciler) logErrorAndReturn(err error, msg string
 }
 
 func sanitizeScheduledSearch(scheduledSearch *humioapi.ScheduledSearch) {
+	scheduledSearch.ID = ""
 	scheduledSearch.RunAsUserID = ""
 }
diff --git a/pkg/humio/filteralert_transform.go b/pkg/humio/filteralert_transform.go
@@ -27,10 +27,6 @@ func FilterAlertTransform(hfa *humiov1alpha1.HumioFilterAlert) (*humioapi.Filter
 		filterAlert.ID = hfa.ObjectMeta.Annotations[FilterAlertIdentifierAnnotation]
 	}
 
-	if filterAlert.Labels == nil {
-		filterAlert.Labels = []string{}
-	}
-
 	return filterAlert, nil
 }