Removed PDBs from snapshot (#329)

Removed PDBs from snapshot

Author: romanbaron

cmd/snapshot-tool/main.go

@@ -168,13 +168,6 @@ func loadClientsWithSnapshot(rawObjects *snapshot.RawKubernetesObjects) (*fake.C
 		}
 	}
 
-	for _, podDisruptionBudget := range rawObjects.PodDisruptionBudgets {
-		_, err := kubeClient.PolicyV1().PodDisruptionBudgets(podDisruptionBudget.Namespace).Create(context.TODO(), podDisruptionBudget, v1.CreateOptions{})
-		if err != nil {
-			log.InfraLogger.Errorf("Failed to create pod disruption budget: %v", err)
-		}
-	}
-
 	for _, priorityClass := range rawObjects.PriorityClasses {
 		_, err := kubeClient.SchedulingV1().PriorityClasses().Create(context.TODO(), priorityClass, v1.CreateOptions{})
 		if err != nil {

deployments/kai-scheduler/templates/rbac/scheduler.yaml

@@ -61,14 +61,6 @@ rules:
   - get
   - list
   - watch
-- apiGroups:
-  - policy
-  resources:
-  - poddisruptionbudgets
-  verbs:
-  - get
-  - list
-  - watch
 - apiGroups:
   - resource.k8s.io
   resources:

docs/plugins/snapshot.md

@@ -17,7 +17,6 @@ The snapshot plugin is a framework plugin that provides an HTTP endpoint to capt
   - Queues
   - PodGroups
   - BindRequests
-  - PodDisruptionBudgets
   - PriorityClasses
   - ConfigMaps
   - PersistentVolumeClaims

pkg/scheduler/api/podgroup_info/job_info.go

@@ -27,7 +27,6 @@ import (
 	"golang.org/x/exp/maps"
 	"golang.org/x/exp/slices"
 	v1 "k8s.io/api/core/v1"
-	policyv1 "k8s.io/api/policy/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/utils/ptr"
@@ -88,9 +87,6 @@ type PodGroupInfo struct {
 	PodGroup           *enginev2alpha2.PodGroup
 	PodGroupUID        types.UID
 
-	// TODO(k82cn): keep backward compatibility, removed it when v1alpha1 finalized.
-	PDB *policyv1.PodDisruptionBudget
-
 	StalenessInfo
 
 	schedulingConstraintsSignature common_info.SchedulingConstraintsSignature
@@ -176,17 +172,6 @@ func (podGroupInfo *PodGroupInfo) SetPodGroup(pg *enginev2alpha2.PodGroup) {
 		podGroupInfo.Name, podGroupInfo.PodGroupUID)
 }
 
-func (podGroupInfo *PodGroupInfo) SetPDB(pdb *policyv1.PodDisruptionBudget) {
-	podGroupInfo.Name = pdb.Name
-	if pdb.Spec.MinAvailable != nil {
-		podGroupInfo.MinAvailable = pdb.Spec.MinAvailable.IntVal
-	}
-	podGroupInfo.Namespace = pdb.Namespace
-
-	podGroupInfo.CreationTimestamp = pdb.GetCreationTimestamp()
-	podGroupInfo.PDB = pdb
-}
-
 func (podGroupInfo *PodGroupInfo) addTaskIndex(ti *pod_info.PodInfo) {
 	if _, found := podGroupInfo.PodStatusIndex[ti.Status]; !found {
 		podGroupInfo.PodStatusIndex[ti.Status] = pod_info.PodsMap{}
@@ -408,7 +393,6 @@ func (podGroupInfo *PodGroupInfo) CloneWithTasks(tasks []*pod_info.PodInfo) *Pod
 		JobFitErrors:   make(enginev2alpha2.UnschedulableExplanations, 0),
 		NodesFitErrors: make(map[common_info.PodID]*common_info.FitErrors),
 
-		PDB:         podGroupInfo.PDB,
 		PodGroup:    podGroupInfo.PodGroup,
 		PodGroupUID: podGroupInfo.PodGroupUID,
 

pkg/scheduler/cache/cluster_info/cluster_info.go

@@ -24,10 +24,7 @@ import (
 
 	"github.com/pkg/errors"
 	v1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/api/meta"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/informers"
 	"k8s.io/client-go/tools/cache"
 
@@ -335,11 +332,6 @@ func (c *ClusterInfo) snapshotPodGroups(
 		result[common_info.PodGroupID(podGroup.Name)] = podGroupInfo
 	}
 
-	err = c.updatePodDisruptionBudgets(result)
-	if err != nil {
-		return nil, err
-	}
-
 	return result, nil
 }
 
@@ -360,23 +352,6 @@ func (c *ClusterInfo) getPodInfo(
 	return podInfo
 }
 
-func (c *ClusterInfo) updatePodDisruptionBudgets(podGroups map[common_info.PodGroupID]*podgroup_info.PodGroupInfo) error {
-	pdbs, err := c.dataLister.ListPodDisruptionBudgets()
-	if err != nil {
-		return err
-	}
-	for _, pdb := range pdbs {
-		podGroupId := common_info.PodGroupID(getController(pdb))
-		podGroup, found := podGroups[podGroupId]
-		if !found {
-			continue
-		}
-		podGroup.SetPDB(pdb)
-	}
-
-	return nil
-}
-
 func (c *ClusterInfo) setPodGroupWithIndex(podGroup *enginev2alpha2.PodGroup, podGroupInfo *podgroup_info.PodGroupInfo) {
 	podGroupInfo.SetPodGroup(podGroup)
 }
@@ -509,17 +484,3 @@ func (c *ClusterInfo) isPodGroupUpForScheduler(podGroup *enginev2alpha2.PodGroup
 
 	return false
 }
-
-func getController(obj interface{}) types.UID {
-	accessor, err := meta.Accessor(obj)
-	if err != nil {
-		return ""
-	}
-
-	controllerRef := metav1.GetControllerOf(accessor)
-	if controllerRef != nil {
-		return controllerRef.UID
-	}
-
-	return ""
-}

pkg/scheduler/cache/cluster_info/cluster_info_test.go

@@ -12,7 +12,6 @@ import (
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/mock/gomock"
 	v1core "k8s.io/api/core/v1"
-	policyv1 "k8s.io/api/policy/v1"
 	v12 "k8s.io/api/scheduling/v1"
 	storage "k8s.io/api/storage/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
@@ -827,43 +826,6 @@ func TestSnapshotPodGroups(t *testing.T) {
 						},
 					},
 				},
-				&policyv1.PodDisruptionBudget{
-					ObjectMeta: v1.ObjectMeta{
-						Name: "pdb-0",
-					},
-				},
-			},
-			results: []*podgroup_info.PodGroupInfo{
-				{
-					Name: "podGroup-0",
-				},
-			},
-		},
-		"WithPDB": {
-			objs: []runtime.Object{
-				&enginev2alpha2.PodGroup{
-					ObjectMeta: v1.ObjectMeta{
-						Name: "",
-						UID:  "ABC",
-					},
-					Spec: enginev2alpha2.PodGroupSpec{
-						Queue: "queue-0",
-					},
-				},
-			},
-			kubeObjs: []runtime.Object{
-				&v1core.Pod{
-					ObjectMeta: v1.ObjectMeta{
-						Annotations: map[string]string{
-							commonconstants.PodGroupAnnotationForPod: "podGroup-0",
-						},
-					},
-				},
-				&policyv1.PodDisruptionBudget{
-					ObjectMeta: v1.ObjectMeta{
-						Name: "pdb-0",
-					},
-				},
 			},
 			results: []*podgroup_info.PodGroupInfo{
 				{
@@ -891,11 +853,6 @@ func TestSnapshotPodGroups(t *testing.T) {
 						},
 					},
 				},
-				&policyv1.PodDisruptionBudget{
-					ObjectMeta: v1.ObjectMeta{
-						Name: "pdb-0",
-					},
-				},
 			},
 			results: []*podgroup_info.PodGroupInfo{},
 		},
@@ -1755,17 +1712,6 @@ func TestSnapshotWithListerErrors(t *testing.T) {
 				mdl.EXPECT().ListPodByIndex(gomock.Any(), gomock.Any()).Return(nil, fmt.Errorf(successErrorMsg))
 			},
 		},
-		"listPodDisruptionBudgets": {
-			func(mdl *data_lister.MockDataLister) {
-				mdl.EXPECT().ListPods().Return([]*v1core.Pod{}, nil)
-				mdl.EXPECT().ListBindRequests().Return([]*schedulingv1alpha2.BindRequest{}, nil)
-				mdl.EXPECT().ListNodes().Return([]*v1core.Node{}, nil)
-				mdl.EXPECT().ListQueues().Return([]*enginev2.Queue{}, nil)
-				mdl.EXPECT().ListPriorityClasses().Return([]*v12.PriorityClass{}, nil)
-				mdl.EXPECT().ListPodGroups().Return([]*enginev2alpha2.PodGroup{}, nil)
-				mdl.EXPECT().ListPodDisruptionBudgets().Return(nil, fmt.Errorf(successErrorMsg))
-			},
-		},
 		"ListBindRequests": {
 			func(mdl *data_lister.MockDataLister) {
 				mdl.EXPECT().ListPods().Return([]*v1core.Pod{}, nil)

pkg/scheduler/cache/cluster_info/data_lister/data_lister_mock.go

@@ -5,7 +5,6 @@ package data_lister
 
 import (
 	v1 "k8s.io/api/core/v1"
-	policyv1 "k8s.io/api/policy/v1"
 	scheduling "k8s.io/api/scheduling/v1"
 	storage "k8s.io/api/storage/v1"
 	"sigs.k8s.io/kueue/apis/kueue/v1alpha1"
@@ -20,7 +19,6 @@ type DataLister interface {
 	ListPodGroups() ([]*schedulingv2alpha2.PodGroup, error)
 	ListNodes() ([]*v1.Node, error)
 	ListQueues() ([]*schedulingv2.Queue, error)
-	ListPodDisruptionBudgets() ([]*policyv1.PodDisruptionBudget, error)
 	ListPriorityClasses() ([]*scheduling.PriorityClass, error)
 	GetPriorityClassByName(name string) (*scheduling.PriorityClass, error)
 	ListPodByIndex(index, value string) ([]interface{}, error)

pkg/scheduler/cache/cluster_info/data_lister/interface.go

@@ -5,13 +5,11 @@ package data_lister
 
 import (
 	v1 "k8s.io/api/core/v1"
-	k8spolicyv1 "k8s.io/api/policy/v1"
 	v14 "k8s.io/api/scheduling/v1"
 	storage "k8s.io/api/storage/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/informers"
 	listv1 "k8s.io/client-go/listers/core/v1"
-	policyv1 "k8s.io/client-go/listers/policy/v1"
 	schedv1 "k8s.io/client-go/listers/scheduling/v1"
 	v12 "k8s.io/client-go/listers/storage/v1"
 	"k8s.io/client-go/tools/cache"
@@ -35,7 +33,6 @@ type k8sLister struct {
 	podLister      listv1.PodLister
 	nodeLister     listv1.NodeLister
 	queueLister    schedlistv2.QueueLister
-	pdbLister      policyv1.PodDisruptionBudgetLister
 	pcLister       schedv1.PriorityClassLister
 	cmLister       listv1.ConfigMapLister
 
@@ -64,7 +61,6 @@ func New(
 		podLister:      informerFactory.Core().V1().Pods().Lister(),
 		nodeLister:     informerFactory.Core().V1().Nodes().Lister(),
 		queueLister:    kubeAiSchedulerInformerFactory.Scheduling().V2().Queues().Lister(),
-		pdbLister:      informerFactory.Policy().V1().PodDisruptionBudgets().Lister(),
 		pcLister:       informerFactory.Scheduling().V1().PriorityClasses().Lister(),
 		cmLister:       informerFactory.Core().V1().ConfigMaps().Lister(),
 
@@ -105,12 +101,6 @@ func (k *k8sLister) ListQueues() ([]*enginev2.Queue, error) {
 	return k.queueLister.List(k.partitionSelector)
 }
 
-// +kubebuilder:rbac:groups=policy,resources=poddisruptionbudgets,verbs=get;list;watch
-
-func (k *k8sLister) ListPodDisruptionBudgets() ([]*k8spolicyv1.PodDisruptionBudget, error) {
-	return k.pdbLister.List(labels.Everything())
-}
-
 // +kubebuilder:rbac:groups="scheduling.k8s.io",resources=priorityclasses,verbs=get;list;watch
 
 func (k *k8sLister) ListPriorityClasses() ([]*v14.PriorityClass, error) {