refactor no olm controller code to handle deletion

Signed-off-by: Ben Luzarraga <[email protected]>

api/v1alpha1/operandrequest_types.go

@@ -131,6 +131,8 @@ const (
 	ResourceTypeCsv             ResourceType = "csv"
 	ResourceTypeOperator        ResourceType = "operator"
 	ResourceTypeOperand         ResourceType = "operands"
+	ResourceTypeConfigmap       ResourceType = "configmap"
+	ResourceTypeDeployment      ResourceType = "deployment"
 )
 
 // Condition represents the current state of the Request Service.

controllers/operandrequestnoolm/operandrequestnoolm_controller.go

@@ -26,7 +26,6 @@ import (
 	"time"
 
 	gset "github.com/deckarep/golang-set"
-	olmv1 "github.com/operator-framework/api/pkg/operators/v1"
 	olmv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
 	"github.com/pkg/errors"
 	authorizationv1 "k8s.io/api/authorization/v1"
@@ -56,9 +55,8 @@ type Reconciler struct {
 	Mutex    sync.Mutex
 }
 type clusterObjects struct {
-	namespace     *corev1.Namespace
-	operatorGroup *olmv1.OperatorGroup
-	subscription  *olmv1alpha1.Subscription
+	namespace *corev1.Namespace
+	configmap *corev1.ConfigMap
 }
 
 //+kubebuilder:rbac:groups=operator.ibm.com,resources=certmanagers;auditloggings,verbs=get;delete
@@ -114,13 +112,13 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Re
 
 	// Remove finalizer when DeletionTimestamp none zero
 	if !requestInstance.ObjectMeta.DeletionTimestamp.IsZero() {
-		//TODO determine if necessary
-		// Check and clean up the subscriptions
-		// err := r.checkFinalizer(ctx, requestInstance)
-		// if err != nil {
-		// 	klog.Errorf("failed to clean up the subscriptions for OperandRequest %s: %v", req.NamespacedName.String(), err)
-		// 	return ctrl.Result{}, err
-		// }
+		//Checkfinalizers calls the delete function, not necessarily subscription based
+		//Check and clean up the operands
+		err := r.checkFinalizer(ctx, requestInstance)
+		if err != nil {
+			klog.Errorf("failed to clean up the operands for OperandRequest %s: %v", req.NamespacedName.String(), err)
+			return ctrl.Result{}, err
+		}
 
 		originalReq := requestInstance.DeepCopy()
 		// Update finalizer to allow delete CR
@@ -163,19 +161,21 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Re
 		return ctrl.Result{Requeue: true}, err
 	}
 
-	// TODO remove this section
+	// TODO this section is likely where we need to put in opreq cleanup logic.
+	//Many of the cleanup functions are run through reconcileoperator as of 1/31/25
 	// Reconcile Operators
-	// if err := r.reconcileOperator(ctx, requestInstance); err != nil {
-	// 	klog.Errorf("failed to reconcile Operators for OperandRequest %s: %v", req.NamespacedName.String(), err)
-	// 	return ctrl.Result{}, err
-	// }
+	if err := r.reconcileOperator(ctx, requestInstance); err != nil {
+		klog.Errorf("failed to reconcile Operators for OperandRequest %s: %v", req.NamespacedName.String(), err)
+		return ctrl.Result{}, err
+	}
 
 	// Reconcile Operands
 	if merr := r.reconcileOperand(ctx, requestInstance); len(merr.Errors) != 0 {
 		klog.Errorf("failed to reconcile Operands for OperandRequest %s: %v", req.NamespacedName.String(), merr)
 		return ctrl.Result{}, merr
 	}
 
+	//TODO update this block to check deployments and their operands instead
 	// Check if all csv deploy succeed
 	if requestInstance.Status.Phase != operatorv1alpha1.ClusterPhaseRunning {
 		klog.V(2).Info("Waiting for all operators and operands to be deployed successfully ...")

controllers/operandrequestnoolm/reconcile_operand.go

@@ -97,55 +97,8 @@ func (r *Reconciler) reconcileOperand(ctx context.Context, requestInstance *oper
 			// Looking for the CSV
 			namespace := r.GetOperatorNamespace(opdRegistry.InstallMode, opdRegistry.Namespace)
 
-			//TODO remove this section
-			// sub, err := r.GetSubscription(ctx, operatorName, namespace, registryInstance.Namespace, opdRegistry.PackageName)
-			// if err != nil {
-			// 	merr.Add(errors.Wrapf(err, "failed to get the Subscription %s in the namespace %s and %s", operatorName, namespace, registryInstance.Namespace))
-			// 	return merr
-			// }
-
-			// if !opdRegistry.UserManaged {
-			// 	if sub == nil {
-			// 		klog.Warningf("There is no Subscription %s or %s in the namespace %s and %s", operatorName, opdRegistry.PackageName, namespace, registryInstance.Namespace)
-			// 		continue
-			// 	}
-
-			// 	if _, ok := sub.Labels[constant.OpreqLabel]; !ok {
-			// 		// Subscription existing and not managed by OperandRequest controller
-			// 		klog.Warningf("Subscription %s in the namespace %s isn't created by ODLM", sub.Name, sub.Namespace)
-			// 	}
-
-			// 	// It the installplan is not created yet, ODLM will try later
-			// 	if sub.Status.Install == nil || sub.Status.InstallPlanRef.Name == "" {
-			// 		klog.Warningf("The Installplan for Subscription %s is not ready. Will check it again", sub.Name)
-			// 		requestInstance.SetMemberStatus(operand.Name, operatorv1alpha1.OperatorInstalling, "", &r.Mutex)
-			// 		continue
-			// 	}
-
-			// 	// If the installplan is deleted after is completed, ODLM won't block the CR update.
-			// 	ipName := sub.Status.InstallPlanRef.Name
-			// 	ipNamespace := sub.Namespace
-			// 	ip := &olmv1alpha1.InstallPlan{}
-			// 	ipKey := types.NamespacedName{
-			// 		Name:      ipName,
-			// 		Namespace: ipNamespace,
-			// 	}
-			// 	if err := r.Client.Get(ctx, ipKey, ip); err != nil {
-			// 		if !apierrors.IsNotFound(err) {
-			// 			merr.Add(errors.Wrapf(err, "failed to get Installplan"))
-			// 		}
-			// 	} else if ip.Status.Phase == olmv1alpha1.InstallPlanPhaseFailed {
-			// 		klog.Errorf("installplan %s/%s is failed", ipNamespace, ipName)
-			// 		requestInstance.SetMemberStatus(operand.Name, operatorv1alpha1.OperatorFailed, "", &r.Mutex)
-			// 		continue
-			// 	}
-
-			// }
-
-			//var csv *olmv1alpha1.ClusterServiceVersion
 			var deployment *appsv1.Deployment
 
-			//TODO need to translate this if block to look for deployments and not CSVs
 			deploymentList, err := r.GetDeploymentListFromPackage(ctx, opdRegistry.PackageName, opdRegistry.Namespace)
 			if err != nil {
 				merr.Add(err)
@@ -154,7 +107,6 @@ func (r *Reconciler) reconcileOperand(ctx context.Context, requestInstance *oper
 			}
 			deployment = deploymentList[0]
 
-			//TODO change this block to deal with an empty list of deployments instead of csvs
 			if deployment == nil {
 				klog.Warningf("Deployment for %s in the namespace %s is not ready yet, retry", operatorName, namespace)
 				requestInstance.SetMemberStatus(operand.Name, operatorv1alpha1.OperatorInstalling, "", &r.Mutex)
@@ -169,19 +121,6 @@ func (r *Reconciler) reconcileOperand(ctx context.Context, requestInstance *oper
 			// 	continue
 			// }
 
-			//TODO git rid of this section
-			// if !opdRegistry.UserManaged {
-			// 	// find the OperandRequest which has the same operator's channel or fallback channels as existing subscription.
-			// 	// ODLM will only reconcile Operand based on OperandConfig for this OperandRequest
-			// 	channels := []string{opdRegistry.Channel}
-			// 	if channels = append(channels, opdRegistry.FallbackChannels...); !util.Contains(channels, sub.Spec.Channel) {
-			// 		klog.Infof("Subscription %s in the namespace %s is NOT managed by %s/%s, Skip reconciling Operands", sub.Name, sub.Namespace, requestInstance.Namespace, requestInstance.Name)
-			// 		requestInstance.SetMemberStatus(operand.Name, operatorv1alpha1.OperatorFailed, "", &r.Mutex)
-			// 		continue
-			// 	}
-			// }
-
-			//TODO update to deployment name
 			klog.V(3).Info("Generating customresource base on Deployment: ", deployment.GetName())
 			requestInstance.SetMemberStatus(operand.Name, operatorv1alpha1.OperatorRunning, "", &r.Mutex)
 
@@ -195,7 +134,6 @@ func (r *Reconciler) reconcileOperand(ctx context.Context, requestInstance *oper
 						klog.V(2).Infof("There is no service: %s from the OperandConfig instance: %s/%s, Skip reconciling Operands", operand.Name, registryKey.Namespace, req.Registry)
 						continue
 					}
-					//TODO pass through deployment values here
 					err = r.reconcileCRwithConfig(ctx, opdConfig, configInstance.Name, configInstance.Namespace, deployment, requestInstance, operand.Name, deployment.Namespace, &r.Mutex)
 					if err != nil {
 						merr.Add(err)
@@ -263,7 +201,6 @@ func (r *Reconciler) reconcileCRwithConfig(ctx context.Context, service *operato
 		}
 	}
 
-	//TODO change this to deployment, make sure GetAnnotations works for deployments the same way
 	almExamples := deployment.GetAnnotations()["alm-examples"]
 
 	// Convert CR template string to slice
@@ -320,7 +257,6 @@ func (r *Reconciler) reconcileCRwithConfig(ctx context.Context, service *operato
 		}
 
 		if !foundInConfig {
-			//TODO change to deployment
 			klog.Warningf("%v in the alm-example doesn't exist in the OperandConfig for %v", crFromALM.GetKind(), deployment.GetName())
 			continue
 		}
@@ -365,7 +301,6 @@ func (r *Reconciler) reconcileCRwithConfig(ctx context.Context, service *operato
 
 	for cr, found := range foundMap {
 		if !found {
-			//TODO change to deployment
 			klog.Warningf("Custom resource %v doesn't exist in the alm-example of %v", cr, deployment.GetName())
 		}
 	}