From 9ec55d141f90faaf52fd6df271e987e5a6781945 Mon Sep 17 00:00:00 2001 From: Yuki Iwai Date: Sat, 21 Jan 2023 02:42:23 +0900 Subject: [PATCH] Upgrade PriorityClass apiVersion to scheduling.k8s.io/v1 (#208) Signed-off-by: Yuki Iwai Signed-off-by: Yuki Iwai --- pkg/controller.v1/common/job_controller.go | 2 +- pkg/controller.v1/common/service_test.go | 2 +- pkg/controller.v1/common/util.go | 4 ++-- pkg/reconciler.v1/common/gang_scheduler_framework.go | 6 +++--- pkg/reconciler.v1/common/gang_volcano.go | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkg/controller.v1/common/job_controller.go b/pkg/controller.v1/common/job_controller.go index b45622fc..730b55f4 100644 --- a/pkg/controller.v1/common/job_controller.go +++ b/pkg/controller.v1/common/job_controller.go @@ -33,7 +33,7 @@ import ( "k8s.io/client-go/kubernetes/scheme" typedcorev1 "k8s.io/client-go/kubernetes/typed/core/v1" corelisters "k8s.io/client-go/listers/core/v1" - schedulinglisters "k8s.io/client-go/listers/scheduling/v1beta1" + schedulinglisters "k8s.io/client-go/listers/scheduling/v1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" diff --git a/pkg/controller.v1/common/service_test.go b/pkg/controller.v1/common/service_test.go index 842c6c6f..8814b1ff 100644 --- a/pkg/controller.v1/common/service_test.go +++ b/pkg/controller.v1/common/service_test.go @@ -16,7 +16,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kubeclientset "k8s.io/client-go/kubernetes" corelisters "k8s.io/client-go/listers/core/v1" - schedulinglisters "k8s.io/client-go/listers/scheduling/v1beta1" + schedulinglisters "k8s.io/client-go/listers/scheduling/v1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" diff --git a/pkg/controller.v1/common/util.go b/pkg/controller.v1/common/util.go index 99229034..9e084925 100644 --- a/pkg/controller.v1/common/util.go +++ b/pkg/controller.v1/common/util.go @@ -22,7 +22,7 @@ import ( apiv1 "github.com/kubeflow/common/pkg/apis/common/v1" log "github.com/sirupsen/logrus" v1 "k8s.io/api/core/v1" - "k8s.io/api/scheduling/v1beta1" + schedulingv1 "k8s.io/api/scheduling/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) @@ -103,7 +103,7 @@ func AddResourceList(list, req, limit v1.ResourceList) { } } -type PriorityClassGetFunc func(string) (*v1beta1.PriorityClass, error) +type PriorityClassGetFunc func(string) (*schedulingv1.PriorityClass, error) func CalcPGMinResources(minMember int32, replicas map[apiv1.ReplicaType]*apiv1.ReplicaSpec, pcGetFunc PriorityClassGetFunc) *v1.ResourceList { var replicasPriority ReplicasPriority diff --git a/pkg/reconciler.v1/common/gang_scheduler_framework.go b/pkg/reconciler.v1/common/gang_scheduler_framework.go index 67876d8e..d2b4f473 100644 --- a/pkg/reconciler.v1/common/gang_scheduler_framework.go +++ b/pkg/reconciler.v1/common/gang_scheduler_framework.go @@ -23,7 +23,7 @@ import ( log "github.com/sirupsen/logrus" corev1 "k8s.io/api/core/v1" - "k8s.io/api/scheduling/v1beta1" + schedulingv1 "k8s.io/api/scheduling/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" @@ -176,8 +176,8 @@ func (r *SchedulerFrameworkReconciler) calcPGMinResources( replicas map[commonv1.ReplicaType]*commonv1.ReplicaSpec, ) *corev1.ResourceList { return controllerv1.CalcPGMinResources(minMember, replicas, - func(pc string) (*v1beta1.PriorityClass, error) { - priorityClass := &v1beta1.PriorityClass{} + func(pc string) (*schedulingv1.PriorityClass, error) { + priorityClass := &schedulingv1.PriorityClass{} err := r.Get(context.TODO(), types.NamespacedName{Name: pc}, priorityClass) return priorityClass, err }) diff --git a/pkg/reconciler.v1/common/gang_volcano.go b/pkg/reconciler.v1/common/gang_volcano.go index 5ef2a74c..225bb70d 100644 --- a/pkg/reconciler.v1/common/gang_volcano.go +++ b/pkg/reconciler.v1/common/gang_volcano.go @@ -24,7 +24,7 @@ import ( log "github.com/sirupsen/logrus" corev1 "k8s.io/api/core/v1" - "k8s.io/api/scheduling/v1beta1" + schedulingv1 "k8s.io/api/scheduling/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" @@ -193,8 +193,8 @@ func (r *VolcanoReconciler) DecoratePodForGangScheduling(rtype string, podTempla // calcPGMinResources calculates the minimal resources needed for this job. The value will be embedded into the associated PodGroup func (r *VolcanoReconciler) calcPGMinResources(minMember int32, replicas map[commonv1.ReplicaType]*commonv1.ReplicaSpec) *corev1.ResourceList { - pcGetFunc := func(pc string) (*v1beta1.PriorityClass, error) { - priorityClass := &v1beta1.PriorityClass{} + pcGetFunc := func(pc string) (*schedulingv1.PriorityClass, error) { + priorityClass := &schedulingv1.PriorityClass{} err := r.Get(context.Background(), types.NamespacedName{Name: pc}, priorityClass) return priorityClass, err }