chore- remove old migrate flows

Signed-off-by: Fred Rolland <[email protected]>

Author: rollandf

pkg/migrate/migrate.go

@@ -23,7 +23,6 @@ import (
 
 	"github.com/go-logr/logr"
 	appsv1 "k8s.io/api/apps/v1"
-	v1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
 	apiErrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -75,15 +74,6 @@ func Migrate(ctx context.Context, log logr.Logger, c client.Client) error {
 }
 
 func migrate(ctx context.Context, log logr.Logger, c client.Client) error {
-	if err := removeWhereaboutsIPReconcileCronJob(ctx, log, c); err != nil {
-		// not critical for the operator operation, safer to ignore
-		log.V(consts.LogLevelWarning).Info("ignore error during whereabouts CronJob removal")
-	}
-	if err := removeStateLabelFromNVIpamConfigMap(ctx, log, c); err != nil {
-		// critical for the operator operation, will fail NVIPAM migration
-		log.V(consts.LogLevelError).Error(err, "error trying to remove state label on NV IPAM configmap")
-		return err
-	}
 	if err := handleSingleMofedDS(ctx, log, c); err != nil {
 		// critical for the operator operation, will fail Mofed migration
 		log.V(consts.LogLevelError).Error(err, "error trying to handle single MOFED DS")
@@ -92,64 +82,6 @@ func migrate(ctx context.Context, log logr.Logger, c client.Client) error {
 	return nil
 }
 
-// reason: update whereabouts to version v0.6.1 in network-operator v23.4.0
-// remove whereabouts-ip-reconciler CronJob from network-operator namespace
-// IP reconciliation logic is now built in whereabouts, and we don't need to deploy CronJob separately.
-// The network-operator will not deploy CronJob for new deployments anymore, and we also need to remove the job
-// which were deployed by the previous Network-operator version.
-func removeWhereaboutsIPReconcileCronJob(ctx context.Context, log logr.Logger, c client.Client) error {
-	namespace := config.FromEnv().State.NetworkOperatorResourceNamespace
-	cronJobName := "whereabouts-ip-reconciler"
-	err := c.Delete(ctx, &v1.CronJob{ObjectMeta: metav1.ObjectMeta{Namespace: namespace, Name: cronJobName}})
-	if err == nil {
-		log.V(consts.LogLevelDebug).Info("whereabouts IP reconciler CronJob removed")
-		return nil
-	}
-	if !apiErrors.IsNotFound(err) {
-		log.V(consts.LogLevelError).Error(err, "failed to remove whereabouts IP reconciler CronJob")
-		return err
-	}
-	return nil
-}
-
-// reason: remove state label on NV IPAM config map if exists, to allow migration to IPPool CR
-// If the state label is present, the config map will be removed by the NCP Controller as a stale object
-func removeStateLabelFromNVIpamConfigMap(ctx context.Context, log logr.Logger, c client.Client) error {
-	namespace := config.FromEnv().State.NetworkOperatorResourceNamespace
-	cmName := "nvidia-k8s-ipam-config"
-	cfg := &corev1.ConfigMap{}
-	key := types.NamespacedName{
-		Name:      cmName,
-		Namespace: namespace,
-	}
-	err := c.Get(ctx, key, cfg)
-	if apiErrors.IsNotFound(err) {
-		log.V(consts.LogLevelDebug).Info("NVIPAM config map not found, skip remove state label")
-		return nil
-	} else if err != nil {
-		log.V(consts.LogLevelError).Error(err, "fail to get NVIPAM configmap")
-		return err
-	}
-	_, ok := cfg.Labels[consts.StateLabel]
-	if ok {
-		log.V(consts.LogLevelDebug).Info("clear State label from NVIPAM configmap")
-		patch := []byte(fmt.Sprintf("[{\"op\": \"remove\", \"path\": \"/metadata/labels/%s\"}]", consts.StateLabel))
-		err = c.Patch(ctx, &corev1.ConfigMap{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      cmName,
-				Namespace: namespace,
-			},
-		}, client.RawPatch(types.JSONPatchType, patch))
-		if err != nil {
-			log.V(consts.LogLevelError).Error(err, "fail to remove State label from NVIPAM configmap")
-			return err
-		}
-	} else {
-		log.V(consts.LogLevelDebug).Info("state label not set on NVIPAM configmap")
-	}
-	return nil
-}
-
 func handleSingleMofedDS(ctx context.Context, log logr.Logger, c client.Client) error {
 	ncp := &mellanoxv1alpha1.NicClusterPolicy{}
 	key := types.NamespacedName{

pkg/migrate/migrate_test.go

@@ -43,26 +43,6 @@ var _ = Describe("Migrate", func() {
 		_ = k8sClient.DeleteAllOf(goctx.Background(), &corev1.Node{})
 		_ = k8sClient.DeleteAllOf(goctx.Background(), &corev1.Pod{})
 	})
-	It("should remove annotation on NVIPAM CM", func() {
-		createConfigMap(true)
-		err := Migrate(goctx.Background(), testLog, k8sClient)
-		Expect(err).NotTo(HaveOccurred())
-		cm := &corev1.ConfigMap{}
-		err = k8sClient.Get(goctx.Background(),
-			types.NamespacedName{Namespace: namespaceName, Name: nvIPAMcmName}, cm)
-		Expect(err).NotTo(HaveOccurred())
-		_, ok := cm.Labels[consts.StateLabel]
-		Expect(ok).To(BeFalse())
-	})
-	It("should not fail if state label does not exists", func() {
-		createConfigMap(false)
-		err := Migrate(goctx.Background(), testLog, k8sClient)
-		Expect(err).NotTo(HaveOccurred())
-	})
-	It("should not fail if NVIPAM CM does not exists", func() {
-		err := Migrate(goctx.Background(), testLog, k8sClient)
-		Expect(err).NotTo(HaveOccurred())
-	})
 	It("should delete MOFED DS", func() {
 		upgrade.SetDriverName("ofed")
 		createNCP()
@@ -91,16 +71,6 @@ var _ = Describe("Migrate", func() {
 	})
 })
 
-func createConfigMap(addLabel bool) {
-	cm := &corev1.ConfigMap{ObjectMeta: metav1.ObjectMeta{Namespace: namespaceName, Name: nvIPAMcmName}}
-	if addLabel {
-		cm.Labels = make(map[string]string)
-		cm.Labels[consts.StateLabel] = "state-nv-ipam-cni"
-	}
-	err := k8sClient.Create(goctx.Background(), cm)
-	Expect(err).NotTo(HaveOccurred())
-}
-
 func createMofedDS() {
 	ds := &appsv1.DaemonSet{
 		ObjectMeta: metav1.ObjectMeta{