Merge pull request #107 from PDOK/jd/shared-status-update

Jd/shared status update

Author: jelledijkstra97

api/v3/wfs_types.go

@@ -59,6 +59,10 @@ type WFS struct {
 	Status smoothoperatormodel.OperatorStatus `json:"status,omitempty"`
 }
 
+func (wfs *WFS) OperatorStatus() *smoothoperatormodel.OperatorStatus {
+	return &wfs.Status
+}
+
 // +kubebuilder:object:root=true
 
 // WFSList contains a list of WFS.

api/v3/wms_types.go

@@ -68,6 +68,10 @@ type WMS struct {
 	Status smoothoperatormodel.OperatorStatus `json:"status,omitempty"`
 }
 
+func (wms *WMS) OperatorStatus() *smoothoperatormodel.OperatorStatus {
+	return &wms.Status
+}
+
 // +kubebuilder:object:root=true
 
 // WMSList contains a list of WMS.

go.mod

@@ -13,7 +13,7 @@ require (
 	github.com/pdok/featureinfo-generator v1.4.0
 	github.com/pdok/ogc-capabilities-generator v1.0.1
 	github.com/pdok/ogc-specifications v1.0.0
-	github.com/pdok/smooth-operator v1.1.1
+	github.com/pdok/smooth-operator v1.2.0
 	github.com/peterbourgon/ff v1.7.1
 	github.com/stretchr/testify v1.10.0
 	github.com/traefik/traefik/v3 v3.4.1

go.sum

@@ -152,8 +152,8 @@ github.com/pdok/ogc-capabilities-generator v1.0.1 h1:7cKgdcWO4y+M9a2hW8ONhmBxGER
 github.com/pdok/ogc-capabilities-generator v1.0.1/go.mod h1:Fnq2i1X3Aufjx/ptQ34c9knw1mDMUAQt0MTBscqX0/M=
 github.com/pdok/ogc-specifications v1.0.0 h1:YqVqKwgOrPprTuRcNrFJeUuxSHOIeOSQStBcYJZUGcA=
 github.com/pdok/ogc-specifications v1.0.0/go.mod h1:YDngwkwrWOfc5MYnEYseiv97K1Y9bZXlVzwi/8EaIl8=
-github.com/pdok/smooth-operator v1.1.1 h1:nKLXYnZooORpBzDwjl69WplVf+2y4pu8j8qVzvepbJU=
-github.com/pdok/smooth-operator v1.1.1/go.mod h1:tqr/CDCXZHNzQzQVlSAnCmsPlx9tWAObsj8hg9mSSEU=
+github.com/pdok/smooth-operator v1.2.0 h1:KFFNsFzk16IfcHPmHkgJnmbhIIY69k7crhPft3lXih8=
+github.com/pdok/smooth-operator v1.2.0/go.mod h1:tqr/CDCXZHNzQzQVlSAnCmsPlx9tWAObsj8hg9mSSEU=
 github.com/pelletier/go-toml v1.6.0/go.mod h1:5N711Q9dKgbdkxHL+MEfF31hpT7l0S0s/t2kKREewys=
 github.com/peterbourgon/ff v1.7.1 h1:xt1lxTG+Nr2+tFtysY7abFgPoH3Lug8CwYJMOmJRXhk=
 github.com/peterbourgon/ff v1.7.1/go.mod h1:fYI5YA+3RDqQRExmFbHnBjEeWzh9TrS8rnRpEq7XIg0=

internal/controller/reconciler.go

@@ -6,12 +6,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-const (
-	reconciledConditionType          = "Reconciled"
-	reconciledConditionReasonSuccess = "Success"
-	reconciledConditionReasonError   = "Error"
-)
-
 type Reconciler interface {
 	*WFSReconciler | *WMSReconciler
 	client.StatusClient

internal/controller/status.go

@@ -31,6 +31,7 @@ import (
 
 	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
 	smoothoperatorv1 "github.com/pdok/smooth-operator/api/v1"
+	smoothoperatorstatus "github.com/pdok/smooth-operator/pkg/status"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -104,7 +105,7 @@ func (r *WFSReconciler) Reconcile(ctx context.Context, req ctrl.Request) (result
 	defer func() {
 		if rec := recover(); rec != nil {
 			err = recoveredPanicToError(rec)
-			logAndUpdateStatusError(ctx, r, wfs, err)
+			smoothoperatorstatus.LogAndUpdateStatusError(ctx, r.Client, wfs, err)
 		}
 	}()
 
@@ -121,11 +122,11 @@ func (r *WFSReconciler) Reconcile(ctx context.Context, req ctrl.Request) (result
 	operationResults, err := createOrUpdateAllForWMSWFS(ctx, r, wfs, ownerInfo)
 	if err != nil {
 		lgr.Info("failed creating resources for wfs", "wfs", wfs.Name)
-		logAndUpdateStatusError(ctx, r, wfs, err)
+		smoothoperatorstatus.LogAndUpdateStatusError(ctx, r.Client, wfs, err)
 		return result, err
 	}
 	lgr.Info("finished creating resources for wfs", "wfs", wfs.Name)
-	logAndUpdateStatusFinished(ctx, r, wfs, operationResults)
+	smoothoperatorstatus.LogAndUpdateStatusFinished(ctx, r.Client, wfs, operationResults)
 
 	return result, err
 }

internal/controller/wfs_controller.go

@@ -33,6 +33,7 @@ import (
 	"github.com/pdok/mapserver-operator/internal/controller/legendgenerator"
 	"github.com/pdok/mapserver-operator/internal/controller/ogcwebserviceproxy"
 	smoothoperatorv1 "github.com/pdok/smooth-operator/api/v1"
+	smoothoperatorstatus "github.com/pdok/smooth-operator/pkg/status"
 	smoothoperatorutils "github.com/pdok/smooth-operator/pkg/util"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -115,7 +116,7 @@ func (r *WMSReconciler) Reconcile(ctx context.Context, req ctrl.Request) (result
 	defer func() {
 		if rec := recover(); rec != nil {
 			err = recoveredPanicToError(rec)
-			logAndUpdateStatusError(ctx, r, wms, err)
+			smoothoperatorstatus.LogAndUpdateStatusError(ctx, r.Client, wms, err)
 		}
 	}()
 
@@ -132,11 +133,11 @@ func (r *WMSReconciler) Reconcile(ctx context.Context, req ctrl.Request) (result
 	operationResults, err := createOrUpdateAllForWMSWFS(ctx, r, wms, ownerInfo)
 	if err != nil {
 		lgr.Info("failed creating resources for wms", "wms", wms.Name)
-		logAndUpdateStatusError(ctx, r, wms, err)
+		smoothoperatorstatus.LogAndUpdateStatusError(ctx, r.Client, wms, err)
 		return result, err
 	}
 	lgr.Info("finished creating resources for wms", "wms", wms.Name)
-	logAndUpdateStatusFinished(ctx, r, wms, operationResults)
+	smoothoperatorstatus.LogAndUpdateStatusFinished(ctx, r.Client, wms, operationResults)
 
 	return result, err
 }