fix(AM-13396): fix app & dns pods related errors

Signed-off-by: Mridul Gain <[email protected]>

controllers/slice/reconciler.go

@@ -144,10 +144,12 @@ func (r *SliceReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl
 		return result, err
 	}
 
-	if slice.Status.DNSIP == "" {
-		requeue, result, err := r.handleDnsSvc(ctx, slice)
-		if requeue {
-			return result, err
+	if slice.Status.SliceConfig.SliceOverlayNetworkDeploymentMode != v1alpha1.NONET {
+		if slice.Status.DNSIP == "" {
+			requeue, result, err := r.handleDnsSvc(ctx, slice)
+			if requeue {
+				return result, err
+			}
 		}
 	}
 
@@ -187,12 +189,18 @@ func (r *SliceReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl
 		return r.handleAppPodStatusChange(appPods, slice, ctx)
 	}
 
-	debugLog.Info("reconciling app pods")
-	res, err, requeue = r.ReconcileAppPod(ctx, slice)
-	if err != nil {
-		log.Error(err, "App pod reconciliation failed")
-		return res, err
+	if slice.Status.SliceConfig.SliceOverlayNetworkDeploymentMode == v1alpha1.NONET {
+		debugLog.Info("No communication slice, skipping reconciliation of apppods")
+		// to support net to no-net switching write a function to remove nsm interfaces, ips, labels with nsmip etc from existing app pods
+	} else {
+		debugLog.Info("reconciling app pods")
+		res, err, requeue = r.ReconcileAppPod(ctx, slice)
+		if err != nil {
+			log.Error(err, "App pod reconciliation failed")
+			return res, err
+		}
 	}
+
 	if requeue {
 		// reconciliation success, update the app pod list in controller
 		log.Info("updating app pod list in hub workersliceconfig status")
@@ -373,9 +381,11 @@ func (r *SliceReconciler) handleSliceDeletion(slice *kubeslicev1beta1.Slice, ctx
 	} else {
 		if controllerutil.ContainsFinalizer(slice, sliceFinalizer) {
 			log.Info("Deleting slice", "slice", slice.Name)
-			err := r.SendSliceDeletionEventToNetOp(ctx, req.NamespacedName.Name, req.NamespacedName.Namespace)
-			if err != nil {
-				log.Error(err, "Failed to send slice deletetion event to netop")
+			if slice.Status.SliceConfig.SliceOverlayNetworkDeploymentMode != v1alpha1.NONET {
+				err := r.SendSliceDeletionEventToNetOp(ctx, req.NamespacedName.Name, req.NamespacedName.Namespace)
+				if err != nil {
+					log.Error(err, "Failed to send slice deletetion event to netop")
+				}
 			}
 			if err := r.cleanupSliceResources(ctx, slice); err != nil {
 				log.Error(err, "error while deleting slice")

controllers/slice/utils.go

@@ -21,6 +21,7 @@ package slice
 import (
 	"context"
 
+	"github.com/kubeslice/apis/pkg/controller/v1alpha1"
 	kubeslicev1beta1 "github.com/kubeslice/worker-operator/api/v1beta1"
 	"github.com/kubeslice/worker-operator/controllers"
 	corev1 "k8s.io/api/core/v1"
@@ -35,9 +36,12 @@ func (r *SliceReconciler) cleanupSliceResources(ctx context.Context, slice *kube
 	if err := r.cleanupSliceNamespaces(ctx, slice); err != nil {
 		return err
 	}
-	//cleanup slice router network service
-	if err := r.cleanupVl3NSE(ctx, slice.Name); err != nil {
-		return err
+	// the crd itself will be absent for no communication slice. skip!
+	if slice.Status.SliceConfig.SliceOverlayNetworkDeploymentMode != v1alpha1.NONET {
+		//cleanup slice router network service
+		if err := r.cleanupVl3NSE(ctx, slice.Name); err != nil {
+			return err
+		}
 	}
 	//cleanup Service Discovery objects - serviceimport and export objects that belong to this slice
 	if err := r.cleanupServiceDiscoveryObjects(ctx, slice.Name); err != nil {

pkg/hub/controllers/cluster/reconciler.go

@@ -116,6 +116,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req reconcile.Request) (reco
 	debuglog.Info("cluster status", "cr.Status.NetworkPresent", cr.Status.NetworkPresent)
 	if err = r.updateNetworkStatus(ctx, cr); err != nil {
 		log.Error(err, "unable to update networkPresent status")
+		return reconcile.Result{}, err
 	}
 	res, err, requeue = r.updateCNISubnetConfig(ctx, cr, cl)
 	if err != nil {
@@ -423,6 +424,13 @@ func (r *Reconciler) updateCNISubnetConfig(ctx context.Context, cr *hubv1alpha1.
 				toUpdate = true
 				return r.Status().Update(ctx, cr)
 			}
+		} else {
+			debuglog.Info("kubeslice networking is disabled, cni subnet list update is not required")
+			if len(cr.Status.CniSubnet) > 0 {
+				debuglog.Info("removing old CNI subnet entries")
+				cr.Status.CniSubnet = []string{}
+				return r.Status().Update(ctx, cr)
+			}
 		}
 		return nil
 	})