code cleanup for pkg/scheduler #100947

lojies · 2021-04-09T07:27:39Z

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

k8s.io/kubernetes/pkg/scheduler/apis/config/v1beta1/defaults.go:23:2: package "k8s.io/api/core/v1" is being imported more than once (ST1019)
k8s.io/kubernetes/pkg/scheduler/apis/config/v1beta1/defaults.go:24:2: other import of "k8s.io/api/core/v1"
k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodevolumelimits/csi.go:78:47: unnecessary use of fmt.Sprintf (S1039)
k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodevolumelimits/non_csi.go:218:47: unnecessary use of fmt.Sprintf (S1039)
k8s.io/kubernetes/pkg/scheduler/framework/plugins/selectorspread/selector_spread.go:184:2: should merge variable declaration with assignment on next line (S1021)
k8s.io/kubernetes/pkg/scheduler/framework/plugins/volumezone/volume_zone.go:126:49: unnecessary use of fmt.Sprint (S1039)
k8s.io/kubernetes/pkg/scheduler/framework/plugins/volumezone/volume_zone.go:142:48: unnecessary use of fmt.Sprint (S1039)
k8s.io/kubernetes/pkg/scheduler/framework/plugins/volumezone/volume_zone.go:158:4: unnecessary assignment to the blank identifier (S1005)
k8s.io/kubernetes/pkg/scheduler/internal/queue/scheduling_queue_test.go:30:2: package "k8s.io/apimachinery/pkg/types" is being imported more than once (ST1019)
k8s.io/kubernetes/pkg/scheduler/internal/queue/scheduling_queue_test.go:31:2: other import of "k8s.io/apimachinery/pkg/types"

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?

NONE

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

k8s-ci-robot · 2021-04-09T07:27:45Z

@lojies: This issue is currently awaiting triage.

If a SIG or subproject determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

k8s-ci-robot · 2021-04-09T07:27:47Z

Hi @lojies. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

yangjunmyfm192085 · 2021-04-09T08:27:27Z

/ok-to-test

hex108 · 2021-04-09T09:16:36Z

pkg/scheduler/framework/plugins/selectorspread/selector_spread.go

@@ -181,8 +181,7 @@ func (pl *SelectorSpread) PreScore(ctx context.Context, cycleState *framework.Cy
 	if skipSelectorSpread(pod) {
 		return nil
 	}
-	var selector labels.Selector
-	selector = helper.DefaultSelector(
+	var selector = helper.DefaultSelector(


Suggested change

var selector = helper.DefaultSelector(

selector := helper.DefaultSelector(

Thanks for the suggestion, i have changed this.

hex108 · 2021-04-09T09:47:38Z

pkg/scheduler/internal/queue/scheduling_queue_test.go

@@ -29,7 +29,6 @@ import (

 	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/types"
 	ktypes "k8s.io/apimachinery/pkg/types"


Would it be better to use "k8s.io/apimachinery/pkg/types" instead of ktypes "k8s.io/apimachinery/pkg/types"?

Yup. Seems other places are all using "k8s.io/apimachinery/pkg/types" directly, and only scheduler code are using the "ktypes" alias:

pkg/scheduler/internal/queue/scheduling_queue.go 34: ktypes "k8s.io/apimachinery/pkg/types" pkg/scheduler/internal/queue/scheduling_queue_test.go 31: ktypes "k8s.io/apimachinery/pkg/types"

lojies · 2021-04-10T05:39:13Z

/retest

lojies · 2021-04-10T06:22:51Z

/retest

lojies · 2021-04-11T07:57:43Z

/test pull-kubernetes-e2e-gce-ubuntu-containerd

hex108 · 2021-04-12T00:38:18Z

/lgtm

Thanks!

Huang-Wei

One final nit. Would you mind removing the ktypes alias in pkg/scheduler/internal/queue/scheduling_queue.go?

lojies · 2021-04-13T01:58:09Z

One final nit. Would you mind removing the ktypes alias in pkg/scheduler/internal/queue/scheduling_queue.go?

@Huang-Wei , i have removed ktypes alias in pkg/scheduler/internal/queue/scheduling_queue.go.

Huang-Wei · 2021-04-13T02:12:35Z

/lgtm
/approve

Thanks!

k8s-ci-robot · 2021-04-13T02:12:57Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Huang-Wei, lojies

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~pkg/scheduler/OWNERS~~ [Huang-Wei]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

lojies · 2021-04-13T02:41:33Z

/retest

fejta-bot · 2021-04-13T05:49:02Z

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

k8s-ci-robot requested review from davidopp and hex108 April 9, 2021 07:27

k8s-ci-robot added sig/scheduling Categorizes an issue or PR as relevant to SIG Scheduling. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Apr 9, 2021

k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Apr 9, 2021

hex108 reviewed Apr 9, 2021

View reviewed changes

lojies force-pushed the cleanuppkgsheduler branch from 9b44e76 to 953cd15 Compare April 10, 2021 04:55

k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 10, 2021

k8s-ci-robot assigned hex108 Apr 12, 2021

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 12, 2021

Huang-Wei reviewed Apr 12, 2021

View reviewed changes

lojies force-pushed the cleanuppkgsheduler branch from 953cd15 to 5ddb1be Compare April 13, 2021 00:11

k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 13, 2021

code cleanup for pkg/scheduler

5ddb1be

k8s-ci-robot assigned Huang-Wei Apr 13, 2021

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 13, 2021

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 13, 2021

chendave mentioned this pull request Apr 13, 2021

Fix couple of nits in nodevolumelimits plugin #100614

Merged

k8s-ci-robot merged commit 1fa101d into kubernetes:master Apr 13, 2021

k8s-ci-robot added this to the v1.22 milestone Apr 13, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

code cleanup for pkg/scheduler #100947

code cleanup for pkg/scheduler #100947

lojies commented Apr 9, 2021

k8s-ci-robot commented Apr 9, 2021

k8s-ci-robot commented Apr 9, 2021

yangjunmyfm192085 commented Apr 9, 2021

hex108 Apr 9, 2021

Huang-Wei Apr 9, 2021

lojies Apr 10, 2021

hex108 Apr 9, 2021

Huang-Wei Apr 9, 2021

lojies commented Apr 10, 2021

lojies commented Apr 10, 2021

lojies commented Apr 11, 2021

hex108 commented Apr 12, 2021

Huang-Wei left a comment

lojies commented Apr 13, 2021

Huang-Wei commented Apr 13, 2021

k8s-ci-robot commented Apr 13, 2021

lojies commented Apr 13, 2021

fejta-bot commented Apr 13, 2021

	var selector = helper.DefaultSelector(
	selector := helper.DefaultSelector(

code cleanup for pkg/scheduler #100947

code cleanup for pkg/scheduler #100947

Conversation

lojies commented Apr 9, 2021

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

k8s-ci-robot commented Apr 9, 2021

k8s-ci-robot commented Apr 9, 2021

yangjunmyfm192085 commented Apr 9, 2021

hex108 Apr 9, 2021

Choose a reason for hiding this comment

Huang-Wei Apr 9, 2021

Choose a reason for hiding this comment

lojies Apr 10, 2021

Choose a reason for hiding this comment

hex108 Apr 9, 2021

Choose a reason for hiding this comment

Huang-Wei Apr 9, 2021

Choose a reason for hiding this comment

lojies commented Apr 10, 2021

lojies commented Apr 10, 2021

lojies commented Apr 11, 2021

hex108 commented Apr 12, 2021

Huang-Wei left a comment

Choose a reason for hiding this comment

lojies commented Apr 13, 2021

Huang-Wei commented Apr 13, 2021

k8s-ci-robot commented Apr 13, 2021

lojies commented Apr 13, 2021

fejta-bot commented Apr 13, 2021