controller: remove the shim for GCing old resources

This patch removes the shim layer that was responsible for
cleanup of old style named reclaimspace/Keyrotation
resources in the cluster.

Note: We do not yet enforce StorageClass as the precedence
upstream. If we choose to do that someday, the changes reverted
in this patch would be required for migration (in a doc maybe?)

Reverts: 0b93f39

Signed-off-by: Niraj Yadav <niryadav@redhat.com>

Author: black-dragon74

internal/controller/csiaddons/pvc_new_controller.go

@@ -115,17 +115,6 @@ func (r *PVCReconiler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Re
 		},
 	}
 
-	// FIXME: This is a shim and should be removed in later releases
-	// along with the field indexers on child objects
-	if requeue, err := utils.CleanOldJobs(ctx,
-		r.Client,
-		logger,
-		req,
-		&csiaddonsv1alpha1.EncryptionKeyRotationCronJobList{},
-		keyRotationName); err != nil || requeue {
-		return ctrl.Result{Requeue: requeue}, err
-	}
-
 	if err := r.reconcileFeature(ctx, logger, pvc, keyRotationChild, keyRotationSched, keyRotationEnabled); err != nil {
 		return ctrl.Result{}, err
 	}
@@ -140,17 +129,6 @@ func (r *PVCReconiler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Re
 		},
 	}
 
-	// FIXME: This is a shim and should be removed in later releases
-	// along with the field indexers on child objects
-	if requeue, err := utils.CleanOldJobs(ctx,
-		r.Client,
-		logger,
-		req,
-		&csiaddonsv1alpha1.ReclaimSpaceCronJobList{},
-		reclaimSpaceName); err != nil || requeue {
-		return ctrl.Result{Requeue: requeue}, err
-	}
-
 	if err := r.reconcileFeature(ctx, logger, pvc, reclaimSpaceChild, reclaimSpaceSched, "true"); err != nil {
 		return ctrl.Result{}, err
 	}

internal/controller/utils/predicates.go

@@ -19,8 +19,6 @@ package utils
 import (
 	"context"
 
-	csiaddonsv1alpha1 "github.com/csi-addons/kubernetes-csi-addons/api/csiaddons/v1alpha1"
-
 	corev1 "k8s.io/api/core/v1"
 	storagev1 "k8s.io/api/storage/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -108,18 +106,6 @@ func SetupPVCControllerIndexers(mgr ctrl.Manager) error {
 				return []string{*pvc.Spec.StorageClassName}
 			},
 		},
-		// FIXME: Remove this shim in later releases
-		{
-			obj:     &csiaddonsv1alpha1.ReclaimSpaceCronJob{},
-			field:   JobOwnerKey,
-			indexFn: ExtractOwnerNameFromPVCObj[*csiaddonsv1alpha1.ReclaimSpaceCronJob],
-		},
-		// FIXME: Remove this shim in later releases
-		{
-			obj:     &csiaddonsv1alpha1.EncryptionKeyRotationCronJob{},
-			field:   JobOwnerKey,
-			indexFn: ExtractOwnerNameFromPVCObj[*csiaddonsv1alpha1.EncryptionKeyRotationCronJob],
-		},
 	}
 
 	for _, index := range indices {

internal/controller/utils/reclaimspace_keyrotation.go

@@ -17,15 +17,11 @@ limitations under the License.
 package utils
 
 import (
-	"context"
 	"errors"
 
 	csiaddonsv1alpha1 "github.com/csi-addons/kubernetes-csi-addons/api/csiaddons/v1alpha1"
 
-	"github.com/go-logr/logr"
-	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
@@ -132,56 +128,3 @@ func ExtractOwnerNameFromPVCObj[T client.Object](rawObj client.Object) []string
 
 	return []string{owner.Name}
 }
-
-func CleanOldJobs(
-	ctx context.Context,
-	c client.Client,
-	log logr.Logger,
-	req ctrl.Request,
-	objList client.ObjectList,
-	expectedName string,
-) (bool, error) {
-	// We need to find all the CronJobs in the namespace of the PVC which
-	// are owned by this controller and remove it if it doesn't match the expected name
-	shouldRequeue := false
-
-	if err := c.List(ctx, objList, client.InNamespace(req.Namespace), client.MatchingFields{JobOwnerKey: req.Name}); client.IgnoreNotFound(err) != nil {
-		return shouldRequeue, err
-	}
-
-	items, err := meta.ExtractList(objList)
-	if err != nil {
-		return shouldRequeue, err
-	}
-
-	for _, item := range items {
-		obj, ok := item.(client.Object)
-		if !ok {
-			// As long as objList is a k8s object
-			// we will never hit this
-			continue
-		}
-		objName := obj.GetName()
-
-		// Only delete what we might have created
-		if owner := metav1.GetControllerOf(obj); owner == nil ||
-			owner.Kind != "PersistentVolumeClaim" ||
-			owner.Name != req.Name {
-			log.Info("Found an object without any owner", "jobName", objName)
-
-			continue
-		}
-
-		// If the name does not match, delete the resource
-		if objName != expectedName {
-			if err := c.Delete(ctx, obj); client.IgnoreNotFound(err) != nil {
-				return shouldRequeue, err
-			}
-
-			shouldRequeue = true
-			log.Info("Deleted old job", "jobName", objName)
-		}
-	}
-
-	return shouldRequeue, nil
-}