feat: added smoothoperator to prevent duplicate code

Author: mortenzwarenstein

go.mod

@@ -6,6 +6,7 @@ require (
 	github.com/onsi/ginkgo/v2 v2.22.1
 	github.com/onsi/gomega v1.36.2
 	github.com/pdok/azure-volume-populator v0.1.1
+	github.com/pdok/smooth-operator v1.2.2
 	k8s.io/api v0.34.0
 	k8s.io/apimachinery v0.34.0
 	k8s.io/client-go v0.34.0
@@ -21,11 +22,11 @@ require (
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/emicklei/go-restful/v3 v3.12.2 // indirect
-	github.com/evanphx/json-patch v4.12.0+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.9.11 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsnotify v1.9.0 // indirect
 	github.com/fxamacker/cbor/v2 v2.9.0 // indirect
+	github.com/go-errors/errors v1.5.1 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-logr/zapr v1.3.0 // indirect
@@ -96,6 +97,8 @@ require (
 	k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
 	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
 	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
+	sigs.k8s.io/kustomize/api v0.19.0 // indirect
+	sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
 	sigs.k8s.io/randfill v1.0.0 // indirect
 	sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
 	sigs.k8s.io/yaml v1.6.0 // indirect

go.sum

@@ -27,6 +27,8 @@ github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S
 github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
 github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=
 github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
+github.com/go-errors/errors v1.5.1 h1:ZwEMSLRCapFLflTpT7NKaAc7ukJ8ZPEjzlxt8rPN8bk=
+github.com/go-errors/errors v1.5.1/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
 github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
@@ -95,6 +97,8 @@ github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8=
 github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY=
 github.com/pdok/azure-volume-populator v0.1.1 h1:4Wx3nvf6dIhsBjntCT8/8pIc0tncL7s+wczQ6iWOOEw=
 github.com/pdok/azure-volume-populator v0.1.1/go.mod h1:VZ6H9R9U4F0RqPct3jTEyPg1ziWuLa1EXO+F4tLZuMc=
+github.com/pdok/smooth-operator v1.2.2 h1:g6wq77mbK335KMb73Hn/7LnRA8VVqtdr7hj+tjrdoiM=
+github.com/pdok/smooth-operator v1.2.2/go.mod h1:tqr/CDCXZHNzQzQVlSAnCmsPlx9tWAObsj8hg9mSSEU=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -249,6 +253,10 @@ sigs.k8s.io/controller-runtime v0.22.1 h1:Ah1T7I+0A7ize291nJZdS1CabF/lB4E++WizgV
 sigs.k8s.io/controller-runtime v0.22.1/go.mod h1:FwiwRjkRPbiN+zp2QRp7wlTCzbUXxZ/D4OzuQUDwBHY=
 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
+sigs.k8s.io/kustomize/api v0.19.0 h1:F+2HB2mU1MSiR9Hp1NEgoU2q9ItNOaBJl0I4Dlus5SQ=
+sigs.k8s.io/kustomize/api v0.19.0/go.mod h1:/BbwnivGVcBh1r+8m3tH1VNxJmHSk1PzP5fkP6lbL1o=
+sigs.k8s.io/kustomize/kyaml v0.19.0 h1:RFge5qsO1uHhwJsu3ipV7RNolC7Uozc0jUBC/61XSlA=
+sigs.k8s.io/kustomize/kyaml v0.19.0/go.mod h1:FeKD5jEOH+FbZPpqUghBP8mrLjJ3+zD3/rf9NNu1cwY=
 sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
 sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
 sigs.k8s.io/structured-merge-diff/v6 v6.3.0 h1:jTijUJbW353oVOd9oTlifJqOGEkUw2jB/fXCbTiQEco=

internal/controller/util.go

@@ -1,38 +1,10 @@
 package controller
 
 import (
-	"context"
-	"fmt"
-
 	"github.com/PDOK/volume-operator/internal/config"
 	appsv1 "k8s.io/api/apps/v1"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-func deleteObjects(ctx context.Context, c client.Client, objects []client.Object) (err error) {
-	for _, obj := range objects {
-		fullName := getObjectFullName(c, obj)
-		err = client.IgnoreNotFound(c.Delete(ctx, obj))
-		if err != nil {
-			return fmt.Errorf("unable to delete resource %s: %w", fullName, err)
-		}
-	}
-	return
-}
-
-func getObjectFullName(c client.Client, obj client.Object) string {
-	groupVersionKind, err := c.GroupVersionKindFor(obj)
-	if err != nil {
-		return ""
-	}
-	key := client.ObjectKeyFromObject(obj)
-
-	return groupVersionKind.Group + "/" +
-		groupVersionKind.Version + "/" +
-		groupVersionKind.Kind + "/" +
-		key.String()
-}
-
 func resourceIsUsedByOtherReplicaSet(rsList appsv1.ReplicaSetList, currentRs appsv1.ReplicaSet) bool {
 	for _, rs := range rsList.Items {
 		if rs.Name == currentRs.Name {
@@ -47,7 +19,3 @@ func resourceIsUsedByOtherReplicaSet(rsList appsv1.ReplicaSetList, currentRs app
 
 	return false
 }
-
-func StringPtr(s string) *string {
-	return &s
-}

internal/controller/volume_controller.go

@@ -35,6 +35,7 @@ import (
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 
 	avp "github.com/pdok/azure-volume-populator/api/v1alpha1"
+	smoothoperator "github.com/pdok/smooth-operator/pkg/util"
 )
 
 type VolumeReconciler struct {
@@ -134,7 +135,7 @@ func createPvcIfNotExists(ctx context.Context, obj client.Client, conf config.Co
 					},
 				},
 				DataSourceRef: &corev1.TypedObjectReference{
-					APIGroup: StringPtr(avp.GroupVersion.Group),
+					APIGroup: smoothoperator.Pointer(avp.GroupVersion.Group),
 					Kind:     populator.Kind,
 					Name:     populator.Name,
 				},
@@ -245,7 +246,7 @@ func deleteAllForReplicaSet(ctx context.Context, c client.Client, rs *appsv1.Rep
 
 	objectsToDelete := []client.Object{populator, pvc, rs}
 
-	return deleteObjects(ctx, c, objectsToDelete)
+	return smoothoperator.DeleteObjects(ctx, c, objectsToDelete)
 }
 
 // SetupWithManager sets up the controller with the Manager.