[refactor] alert reconciler

.github/workflows/build.yml

@@ -22,6 +22,6 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@37335c7bb261b353407cff977110895fa0b4f7d8
         with:
-          go-version: 1.20.x
+          go-version: 1.22.x
       - name: Run build
         run: make build

.github/workflows/docs.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@37335c7bb261b353407cff977110895fa0b4f7d8
         with:
-          go-version: 1.20.x
+          go-version: 1.22.x
       - name: Generate docs
         run: make generate-api-docs
       - name: Check for changes

.github/workflows/e2e-tests.yaml

@@ -30,7 +30,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@37335c7bb261b353407cff977110895fa0b4f7d8
         with:
-          go-version: 1.20.x
+          go-version: 1.22.x
       - name: Running operator and Tests
         env:
           CORALOGIX_REGION: ${{ secrets.CORALOGIX_REGION }}

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.20 as builder
+FROM golang:1.22 as builder
 ARG TARGETOS
 ARG TARGETARCH
 

Makefile

@@ -140,7 +140,7 @@ CRDOC ?= $(LOCALBIN)/crdoc
 
 ## Tool Versions
 KUSTOMIZE_VERSION ?= v3.8.7
-CONTROLLER_TOOLS_VERSION ?= v0.9.2
+CONTROLLER_TOOLS_VERSION ?= v0.15.0
 
 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
 .PHONY: kustomize

apis/coralogix/v1alpha1/alert_types.go

@@ -153,36 +153,26 @@ type AlertSpec struct {
 	AlertType AlertType `json:"alertType"`
 }
 
-func (in *AlertSpec) ExtractCreateAlertRequest(ctx context.Context) (*alerts.CreateAlertRequest, error) {
-	enabled := wrapperspb.Bool(in.Active)
-	name := wrapperspb.String(in.Name)
-	description := wrapperspb.String(in.Description)
-	severity := AlertSchemaSeverityToProtoSeverity[in.Severity]
-	metaLabels := expandMetaLabels(in.Labels)
-	expirationDate := expandExpirationDate(in.ExpirationDate)
-	showInInsight := expandShowInInsight(in.ShowInInsight)
-	notificationGroups, err := expandNotificationGroups(ctx, in.NotificationGroups)
+func (a *Alert) ExtractCreateAlertRequest(ctx context.Context) (*alerts.CreateAlertRequest, error) {
+	notificationGroups, err := expandNotificationGroups(ctx, a.Spec.NotificationGroups)
 	if err != nil {
 		return nil, err
 	}
-	payloadFilters := utils.StringSliceToWrappedStringSlice(in.PayloadFilters)
-	activeWhen := expandActiveWhen(in.Scheduling)
-	alertTypeParams := expandAlertType(in.AlertType)
 
 	return &alerts.CreateAlertRequest{
-		Name:                       name,
-		Description:                description,
-		IsActive:                   enabled,
-		Severity:                   severity,
-		MetaLabels:                 metaLabels,
-		Expiration:                 expirationDate,
-		ShowInInsight:              showInInsight,
+		IsActive:                   wrapperspb.Bool(a.Spec.Active),
+		Name:                       wrapperspb.String(a.Spec.Name),
+		Description:                wrapperspb.String(a.Spec.Description),
+		Severity:                   AlertSchemaSeverityToProtoSeverity[a.Spec.Severity],
+		MetaLabels:                 expandMetaLabels(a.Spec.Labels),
+		Expiration:                 expandExpirationDate(a.Spec.ExpirationDate),
+		ShowInInsight:              expandShowInInsight(a.Spec.ShowInInsight),
 		NotificationGroups:         notificationGroups,
-		NotificationPayloadFilters: payloadFilters,
-		ActiveWhen:                 activeWhen,
-		Filters:                    alertTypeParams.filters,
-		Condition:                  alertTypeParams.condition,
-		TracingAlert:               alertTypeParams.tracingAlert,
+		NotificationPayloadFilters: utils.StringSliceToWrappedStringSlice(a.Spec.PayloadFilters),
+		ActiveWhen:                 expandActiveWhen(a.Spec.Scheduling),
+		Filters:                    expandAlertType(a.Spec.AlertType).filters,
+		Condition:                  expandAlertType(a.Spec.AlertType).condition,
+		TracingAlert:               expandAlertType(a.Spec.AlertType).tracingAlert,
 	}, nil
 }
 
@@ -3117,6 +3107,14 @@ type Alert struct {
 	Status AlertStatus `json:"status,omitempty"`
 }
 
+func NewAlert() *Alert {
+	return &Alert{
+		Spec: AlertSpec{
+			Labels: make(map[string]string),
+		},
+	}
+}
+
 //+kubebuilder:object:root=true
 
 // AlertList contains a list of Alert