Merge pull request #66 from PDOK/jd/ttl

TTL

Author: jelledijkstra97

internal/controller/shared_controller.go

@@ -5,6 +5,9 @@ import (
 	"fmt"
 	"strconv"
 	"strings"
+	"time"
+
+	"github.com/pdok/smooth-operator/model"
 
 	"github.com/pdok/mapserver-operator/internal/controller/constants"
 
@@ -21,6 +24,26 @@ const (
 	AppLabelKey = "app"
 )
 
+func ttlExpired[O pdoknlv3.WMSWFS](obj O) bool {
+	var lifecycle *model.Lifecycle
+	switch any(obj).(type) {
+	case *pdoknlv3.WFS:
+		wfs := any(obj).(*pdoknlv3.WFS)
+		lifecycle = wfs.Spec.Lifecycle
+	case *pdoknlv3.WMS:
+		wms := any(obj).(*pdoknlv3.WMS)
+		lifecycle = wms.Spec.Lifecycle
+	}
+
+	if lifecycle != nil && lifecycle.TTLInDays != nil {
+		expiresAt := obj.GetCreationTimestamp().Add(time.Duration(*lifecycle.TTLInDays) * 24 * time.Hour)
+
+		return expiresAt.Before(time.Now())
+	}
+
+	return false
+}
+
 func ensureLabel[O pdoknlv3.WMSWFS](obj O, key, value string) {
 	labels := obj.GetLabels()
 	if _, ok := labels[key]; !ok {

internal/controller/wfs_controller.go

@@ -99,6 +99,13 @@ func (r *WFSReconciler) Reconcile(ctx context.Context, req ctrl.Request) (result
 		return result, err
 	}
 
+	// Check TTL, delete if expired
+	if ttlExpired(wfs) {
+		err = r.Client.Delete(ctx, wfs)
+
+		return result, err
+	}
+
 	ensureLabel(wfs, "pdok.nl/service-type", "wfs")
 
 	lgr.Info("creating resources for wfs", "wfs", wfs)

internal/controller/wfs_controller_test.go

@@ -30,6 +30,8 @@ import (
 	"os"
 
 	"github.com/pdok/mapserver-operator/internal/controller/types"
+	"github.com/pdok/smooth-operator/model"
+	smoothoperatorutils "github.com/pdok/smooth-operator/pkg/util"
 	k8stypes "k8s.io/apimachinery/pkg/types"
 
 	. "github.com/onsi/ginkgo/v2" //nolint:revive // ginkgo bdd
@@ -177,6 +179,34 @@ var _ = Describe("Testing WFS Controller", func() {
 			}, "10s", "1s").Should(BeTrue())
 		})
 
+		It("Respects the TTL of the WFS", func() {
+			By("Creating a new resource for the Kind WFS")
+
+			ttlName := testWfs.GetName() + "-ttl"
+			ttlWfs := testWfs.DeepCopy()
+			ttlWfs.Name = ttlName
+			ttlWfs.Spec.Lifecycle = &model.Lifecycle{TTLInDays: smoothoperatorutils.Pointer(int32(0))}
+			objectKeyTTLWFS := client.ObjectKeyFromObject(ttlWfs)
+
+			err := k8sClient.Get(ctx, objectKeyTTLWFS, ttlWfs)
+			Expect(client.IgnoreNotFound(err)).To(Not(HaveOccurred()))
+			if err != nil && apierrors.IsNotFound(err) {
+				Expect(k8sClient.Create(ctx, ttlWfs)).To(Succeed())
+			}
+
+			// Reconcile
+			_, err = getWFSReconciler().Reconcile(ctx, reconcile.Request{NamespacedName: objectKeyTTLWFS})
+			Expect(err).To(Not(HaveOccurred()))
+
+			// Check the WFS cannot be found anymore
+			Eventually(func() bool {
+				err = k8sClient.Get(ctx, objectKeyTTLWFS, ttlWfs)
+				return apierrors.IsNotFound(err)
+			}, "10s", "1s").Should(BeTrue())
+
+			// Not checking owned resources because the test env does not do garbage collection
+		})
+
 		It("Should cleanup the cluster", func() {
 			err := k8sClient.Get(ctx, objectKeyWfs, clusterWfs)
 			Expect(client.IgnoreNotFound(err)).NotTo(HaveOccurred())

internal/controller/wms_controller.go

@@ -110,6 +110,13 @@ func (r *WMSReconciler) Reconcile(ctx context.Context, req ctrl.Request) (result
 		return result, client.IgnoreNotFound(err)
 	}
 
+	// Check TTL, delete if expired
+	if ttlExpired(wms) {
+		err = r.Client.Delete(ctx, wms)
+
+		return result, err
+	}
+
 	ensureLabel(wms, "pdok.nl/service-type", "wms")
 
 	lgr.Info("creating resources for wms", "wms", wms)

internal/controller/wms_controller_test.go

@@ -30,6 +30,8 @@ import (
 	"os"
 
 	"github.com/pdok/mapserver-operator/internal/controller/types"
+	"github.com/pdok/smooth-operator/model"
+	smoothoperatorutils "github.com/pdok/smooth-operator/pkg/util"
 
 	. "github.com/onsi/ginkgo/v2" //nolint:revive // ginkgo bdd
 	. "github.com/onsi/gomega"    //nolint:revive // ginkgo bdd
@@ -181,6 +183,34 @@ var _ = Describe("Testing WMS Controller", func() {
 			}, "10s", "1s").Should(BeTrue())
 		})
 
+		It("Respects the TTL of the WMS", func() {
+			By("Creating a new resource for the Kind WMS")
+
+			ttlName := testWMS.GetName() + "-ttl"
+			ttlWms := testWMS.DeepCopy()
+			ttlWms.Name = ttlName
+			ttlWms.Spec.Lifecycle = &model.Lifecycle{TTLInDays: smoothoperatorutils.Pointer(int32(0))}
+			objectKeyTTLWMS := client.ObjectKeyFromObject(ttlWms)
+
+			err := k8sClient.Get(ctx, objectKeyTTLWMS, ttlWms)
+			Expect(client.IgnoreNotFound(err)).To(Not(HaveOccurred()))
+			if err != nil && apierrors.IsNotFound(err) {
+				Expect(k8sClient.Create(ctx, ttlWms)).To(Succeed())
+			}
+
+			// Reconcile
+			_, err = getWMSReconciler().Reconcile(ctx, reconcile.Request{NamespacedName: objectKeyTTLWMS})
+			Expect(err).To(Not(HaveOccurred()))
+
+			// Check the WMS cannot be found anymore
+			Eventually(func() bool {
+				err = k8sClient.Get(ctx, objectKeyTTLWMS, ttlWms)
+				return apierrors.IsNotFound(err)
+			}, "10s", "1s").Should(BeTrue())
+
+			// Not checking owned resources because the test env does not do garbage collection
+		})
+
 		It("Should cleanup the cluster", func() {
 			err := k8sClient.Get(ctx, objectKeyWMS, clusterWMS)
 			Expect(client.IgnoreNotFound(err)).NotTo(HaveOccurred())