Implement finalizer to sync vsp and vsp-p4 delete sequence.

ipu-plugin/pkg/infrapod/infrapod.go

@@ -2,15 +2,13 @@ package infrapod
 
 import (
 	"context"
-	"embed"
 	"fmt"
 	"os"
 	"strconv"
 	"time"
 
 	"github.com/bombsimon/logrusr/v4"
 	"github.com/go-logr/logr"
-	"github.com/intel/ipu-opi-plugins/ipu-plugin/pkg/k8s/render"
 	"github.com/intel/ipu-opi-plugins/ipu-plugin/pkg/types"
 	logrus "github.com/sirupsen/logrus"
 	appsv1 "k8s.io/api/apps/v1"
@@ -29,8 +27,6 @@ import (
 	"k8s.io/client-go/rest"
 )
 
-//go:embed bindata/*
-var binData embed.FS
 var (
 	scheme = runtime.NewScheme()
 )
@@ -164,69 +160,6 @@ func (infrapodMgr *InfrapodMgrOcImpl) getPvCrs() (error, bool) {
 	return err, false
 }
 
-/*
-Create p4 pvc This will create ->
-persistentvolumes
-persistentvolumeclaims
-*/
-func (infrapodMgr *InfrapodMgrOcImpl) CreatePvCrs() error {
-	err, isPresent := infrapodMgr.getPvCrs()
-	if err != nil {
-		infrapodMgr.log.Error(err, "failed to start PV")
-		return fmt.Errorf("failed to get PV due to: %v", err)
-	}
-	if isPresent {
-		infrapodMgr.log.Error(err, "PV already present")
-		return nil
-	}
-	err = render.OperateAllFromBinData(infrapodMgr.log, "vsp-p4-pvc",
-		infrapodMgr.vspP4Template.ToMap(), binData, infrapodMgr.mgr.GetClient(),
-		nil, infrapodMgr.mgr.GetScheme(), false)
-	if err != nil {
-		infrapodMgr.log.Error(err, "failed to start PV")
-		return fmt.Errorf("failed to start PV due to: %v", err)
-	}
-	return nil
-}
-
-/*
-Create p4 pod This will create ->
-ServiceAccount
-role
-rolebindings
-service for p4runtime
-P4 pod
-*/
-func (infrapodMgr *InfrapodMgrOcImpl) CreateCrs() error {
-	err := render.OperateAllFromBinData(infrapodMgr.log, "vsp-p4",
-		infrapodMgr.vspP4Template.ToMap(), binData, infrapodMgr.mgr.GetClient(),
-		nil, infrapodMgr.mgr.GetScheme(), false)
-	if err != nil {
-		infrapodMgr.log.Error(err, "failed to start vsp-p4")
-		return fmt.Errorf("failed to start vsp-p4 (p4Image:%s) due to: %v", infrapodMgr.vspP4Template.ImageName, err)
-	}
-	return nil
-}
-
-/*
-Delete p4 pod This will delete ->
-ServiceAccount
-role
-rolebindings
-service for p4runtime
-P4 pod
-*/
-func (infrapodMgr *InfrapodMgrOcImpl) DeleteCrs() error {
-	err := render.OperateAllFromBinData(infrapodMgr.log, "vsp-p4",
-		infrapodMgr.vspP4Template.ToMap(), binData, infrapodMgr.mgr.GetClient(),
-		nil, infrapodMgr.mgr.GetScheme(), true)
-	if err != nil {
-		infrapodMgr.log.Error(err, "failed to delete vsp-p4")
-		return fmt.Errorf("failed to delete vsp-p4 (p4Image:%s) due to: %v", infrapodMgr.vspP4Template.ImageName, err)
-	}
-	return nil
-}
-
 func (infrapodMgr *InfrapodMgrOcImpl) WaitForPodDelete(timeout time.Duration) error {
 	/*
 		This waits for P4 pod status to be ready.

ipu-plugin/pkg/ipuplugin/ipuplugin.go

@@ -175,22 +175,10 @@ func (s *server) Run() error {
 					syscall.Kill(syscall.Getpid(), syscall.SIGTERM)
 				}
 			}()
-			if err = s.infrapodMgr.DeleteCrs(); err != nil {
-				log.Error(err, "unable to Delete Crs : %v", err)
-				return err
-			}
 			if err = s.infrapodMgr.WaitForPodDelete(60 * time.Second); err != nil {
 				log.Error(err, "unable to Wait for pod deletion : %v", err)
 				return err
 			}
-			if err = s.infrapodMgr.CreatePvCrs(); err != nil {
-				log.Error(err, "unable to Create PV Crs : %v", err)
-				return err
-			}
-			if err = s.infrapodMgr.CreateCrs(); err != nil {
-				log.Error(err, "unable to Create Crs : %v", err)
-				return err
-			}
 			if err = s.infrapodMgr.WaitForPodReady(60 * time.Second); err != nil {
 				log.Error(err, "unable to Wait for pod creation : %v", err)
 				return err
@@ -264,10 +252,6 @@ func (s *server) Stop() {
 		s.bridgeCtlr.DeleteBridges()
 		// Delete P4 rules on exit
 		cleanUpRulesOnExit(s.p4rtClient)
-		if err := s.infrapodMgr.DeleteCrs(); err != nil {
-			log.Error(err, "unable to Delete Crs : %v", err)
-			// Do not return since we continue on error
-		}
 		//Restore Red Hat primary network path via opcodes - This is required after the primiary network P4 rules are deleted.
 		utils.RestoreRHPrimaryNetwork()
 	}

ipu-plugin/pkg/types/types.go

@@ -82,9 +82,6 @@ type P4RTClient interface {
 
 type InfrapodMgr interface {
 	StartMgr() error
-	CreateCrs() error
-	CreatePvCrs() error
-	DeleteCrs() error
 	WaitForPodDelete(timeout time.Duration) error
 	WaitForPodReady(timeout time.Duration) error
 }