Drop github.com/redhat-cop/operator-utils dependency

The functionality from operator-utils is now available in
controller-runtime, making the additional dependency unnecessary as its
functions just wrap controller-runtime

The operator-utils dependency makes updating controller-runtime
difficult as operator-utils itself depends on k8s.io/api and
controller-runtime.

Signed-off-by: Angel Misevski <[email protected]>

Author: amisevsk

controllers/workspace/devworkspace_controller.go

@@ -45,7 +45,6 @@ import (
 	"github.com/devfile/devworkspace-operator/pkg/provision/workspace/rbac"
 	"github.com/go-logr/logr"
 	"github.com/google/uuid"
-	coputil "github.com/redhat-cop/operator-utils/pkg/util"
 	appsv1 "k8s.io/api/apps/v1"
 	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -58,6 +57,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/builder"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
+	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
@@ -291,8 +291,8 @@ func (r *DevWorkspaceReconciler) Reconcile(ctx context.Context, req ctrl.Request
 
 	// Set finalizer on DevWorkspace if necessary
 	// Note: we need to check the flattened workspace to see if a finalizer is needed, as plugins could require storage
-	if storageProvisioner.NeedsStorage(&workspace.Spec.Template) && !coputil.HasFinalizer(clusterWorkspace, constants.StorageCleanupFinalizer) {
-		coputil.AddFinalizer(clusterWorkspace, constants.StorageCleanupFinalizer)
+	if storageProvisioner.NeedsStorage(&workspace.Spec.Template) && !controllerutil.ContainsFinalizer(clusterWorkspace, constants.StorageCleanupFinalizer) {
+		controllerutil.AddFinalizer(clusterWorkspace, constants.StorageCleanupFinalizer)
 		if err := r.Update(ctx, clusterWorkspace.DevWorkspace); err != nil {
 			return reconcile.Result{}, err
 		}
@@ -349,8 +349,8 @@ func (r *DevWorkspaceReconciler) Reconcile(ctx context.Context, req ctrl.Request
 
 	// Add finalizer to ensure workspace rolebinding gets cleaned up when workspace
 	// is deleted.
-	if !coputil.HasFinalizer(clusterWorkspace, constants.RBACCleanupFinalizer) {
-		coputil.AddFinalizer(clusterWorkspace, constants.RBACCleanupFinalizer)
+	if !controllerutil.ContainsFinalizer(clusterWorkspace, constants.RBACCleanupFinalizer) {
+		controllerutil.AddFinalizer(clusterWorkspace, constants.RBACCleanupFinalizer)
 		if err := r.Update(ctx, clusterWorkspace.DevWorkspace); err != nil {
 			return reconcile.Result{}, err
 		}

controllers/workspace/finalize.go

@@ -27,9 +27,9 @@ import (
 	"github.com/devfile/devworkspace-operator/pkg/provision/workspace/rbac"
 
 	"github.com/go-logr/logr"
-	coputil "github.com/redhat-cop/operator-utils/pkg/util"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
+	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
 	"github.com/devfile/devworkspace-operator/pkg/provision/storage"
@@ -94,7 +94,7 @@ func (r *DevWorkspaceReconciler) finalizeStorage(ctx context.Context, log logr.L
 	} else if terminating {
 		// Namespace is terminating, it's redundant to clean PVC files since it's going to be removed
 		log.Info("Namespace is terminating; clearing storage finalizer")
-		coputil.RemoveFinalizer(workspace, constants.StorageCleanupFinalizer)
+		controllerutil.RemoveFinalizer(workspace, constants.StorageCleanupFinalizer)
 		return reconcile.Result{}, r.Update(ctx, workspace.DevWorkspace)
 	}
 
@@ -129,7 +129,7 @@ func (r *DevWorkspaceReconciler) finalizeStorage(ctx context.Context, log logr.L
 		}
 	}
 	log.Info("PVC clean up successful; clearing finalizer")
-	coputil.RemoveFinalizer(workspace, constants.StorageCleanupFinalizer)
+	controllerutil.RemoveFinalizer(workspace, constants.StorageCleanupFinalizer)
 	return reconcile.Result{}, r.Update(ctx, workspace.DevWorkspace)
 }
 
@@ -140,7 +140,7 @@ func (r *DevWorkspaceReconciler) finalizeRBAC(ctx context.Context, log logr.Logg
 	} else if terminating {
 		// Namespace is terminating, it's redundant to update roles/rolebindings since they will be removed with the workspace
 		log.Info("Namespace is terminating; clearing storage finalizer")
-		coputil.RemoveFinalizer(workspace, constants.RBACCleanupFinalizer)
+		controllerutil.RemoveFinalizer(workspace, constants.RBACCleanupFinalizer)
 		return reconcile.Result{}, r.Update(ctx, workspace.DevWorkspace)
 	}
 
@@ -167,7 +167,7 @@ func (r *DevWorkspaceReconciler) finalizeRBAC(ctx context.Context, log logr.Logg
 		}
 	}
 	log.Info("RBAC cleanup successful; clearing finalizer")
-	coputil.RemoveFinalizer(workspace, constants.RBACCleanupFinalizer)
+	controllerutil.RemoveFinalizer(workspace, constants.RBACCleanupFinalizer)
 	return reconcile.Result{}, r.Update(ctx, workspace.DevWorkspace)
 }
 
@@ -185,7 +185,7 @@ func (r *DevWorkspaceReconciler) finalizeServiceAccount(ctx context.Context, log
 		return reconcile.Result{Requeue: true}, nil
 	}
 	log.Info("ServiceAccount clean up successful; clearing finalizer")
-	coputil.RemoveFinalizer(workspace, constants.ServiceAccountCleanupFinalizer)
+	controllerutil.RemoveFinalizer(workspace, constants.ServiceAccountCleanupFinalizer)
 	return reconcile.Result{}, r.Update(ctx, workspace.DevWorkspace)
 }
 

go.mod

@@ -14,7 +14,6 @@ require (
 	github.com/onsi/gomega v1.24.1
 	github.com/openshift/api v0.0.0-20200205133042-34f0ec8dab87
 	github.com/prometheus/client_golang v1.14.0
-	github.com/redhat-cop/operator-utils v1.1.4
 	github.com/stretchr/testify v1.8.0
 	golang.org/x/crypto v0.3.0
 	golang.org/x/net v0.7.0
@@ -28,10 +27,6 @@ require (
 )
 
 require (
-	github.com/BurntSushi/toml v0.3.1 // indirect
-	github.com/Masterminds/goutils v1.1.1 // indirect
-	github.com/Masterminds/semver/v3 v3.1.1 // indirect
-	github.com/Masterminds/sprig/v3 v3.2.2 // indirect
 	github.com/Microsoft/go-winio v0.5.2 // indirect
 	github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4 // indirect
 	github.com/acomagu/bufpipe v1.0.3 // indirect
@@ -41,31 +36,27 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
-	github.com/evanphx/json-patch v4.12.0+incompatible // indirect
+	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/go-git/gcfg v1.5.0 // indirect
 	github.com/go-git/go-billy/v5 v5.3.1 // indirect
 	github.com/go-logr/zapr v1.2.3 // indirect
 	github.com/go-openapi/jsonpointer v0.19.5 // indirect
 	github.com/go-openapi/jsonreference v0.20.0 // indirect
-	github.com/go-openapi/spec v0.19.5 // indirect
 	github.com/go-openapi/swag v0.19.14 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/gnostic v0.5.7-v3refs // indirect
-	github.com/googleapis/gnostic v0.5.5 // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/huandu/xstrings v1.3.1 // indirect
 	github.com/imdario/mergo v0.3.13 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/mailru/easyjson v0.7.6 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
-	github.com/mitchellh/copystructure v1.0.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.1 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -77,9 +68,7 @@ require (
 	github.com/prometheus/common v0.37.0 // indirect
 	github.com/prometheus/procfs v0.8.0 // indirect
 	github.com/sergi/go-diff v1.1.0 // indirect
-	github.com/shopspring/decimal v1.2.0 // indirect
 	github.com/skeema/knownhosts v1.1.0 // indirect
-	github.com/spf13/cast v1.3.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
 	go.uber.org/atomic v1.7.0 // indirect
@@ -100,7 +89,6 @@ require (
 	k8s.io/component-base v0.26.1 // indirect
 	k8s.io/klog/v2 v2.80.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
-	k8s.io/kubectl v0.20.2 // indirect
 	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 )