Do some code cleans. #1129

yanggangtony · 2023-04-26T13:08:46Z

/kind cleanup

Its just some tiny code cleans..

ingvagabund · 2023-04-28T13:56:08Z

pkg/descheduler/policyconfig.go

@@ -120,10 +120,10 @@ func setDefaultEvictor(profile api.DeschedulerProfile, client clientset.Interfac
 	if defaultevictorPluginConfig == nil {
 		profile.PluginConfigs = append([]api.PluginConfig{newPluginConfig}, profile.PluginConfigs...)
 		defaultevictorPluginConfig = &newPluginConfig
-		idx = 0
+		// when defaultevictorPluginConfig is nil , the idx=0


This assumes GetPluginConfig always returns idx == 0 for when defaultevictorPluginConfig == nil. That is another assumption that can be broken without noticing. GetPluginConfig could be later re-implement for non-sequential iteration and return anything other than 0 if not entry is found. Better keep it as it is.

thanks for review.
Will rollback it.

ingvagabund · 2023-04-28T14:26:51Z

pkg/descheduler/policyconfig.go

-		return errorsInProfiles
-	}
-	return nil
+	return errorsInProfiles
 }

 func setErrorsInProfiles(err error, profileName string, errorsInProfiles error) error {


setErrorsInProfiles is used only once. Worth making it inline.

sound good.
update it.

ingvagabund · 2023-05-01T07:12:51Z

pkg/descheduler/policyconfig.go

@@ -140,33 +140,16 @@ func validateDeschedulerConfiguration(in api.DeschedulerPolicy, registry pluginr
 				pluginUtilities := registry[pluginConfig.Name]


We need to fail in case registry[pluginConfig.Name] does not exists. E.g.:

if _, ok := registry[pluginConfig.Name]; !ok { errorsInProfiles = fmt.Errorf("%w: %s", errorsInProfiles, fmt.Sprintf("in profile %s: plugin %s in pluginConfig not registered", profile.Name, pluginConfig.Name)) continue } pluginUtilities := registry[pluginConfig.Name] if pluginUtilities.PluginArgValidator == nil { continue } err := pluginUtilities.PluginArgValidator(pluginConfig.Args) ...

This will also reduce the level of nesting by 2.

Good suggestion.
Update later.

Signed-off-by: yanggang <gang.yang@daocloud.io>

yanggangtony · 2023-05-01T15:10:19Z

@ingvagabund
Thanks for your review.
Rebased again.

ingvagabund · 2023-05-02T11:35:12Z

/approve

k8s-ci-robot · 2023-05-02T11:35:39Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ingvagabund

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:

~~OWNERS~~ [ingvagabund]

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

ingvagabund · 2023-05-02T11:35:40Z

/lgtm

yanggangtony · 2023-05-02T13:32:10Z

thanks.
@ingvagabund

k8s-ci-robot added the kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. label Apr 26, 2023

k8s-ci-robot requested a review from ingvagabund April 26, 2023 13:08

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Apr 26, 2023

k8s-ci-robot requested a review from lixiang233 April 26, 2023 13:08

k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Apr 26, 2023

ingvagabund requested changes Apr 28, 2023

View reviewed changes

ingvagabund requested changes May 1, 2023

View reviewed changes

Do some code cleans.

71fb4a2

Signed-off-by: yanggang <gang.yang@daocloud.io>

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 2, 2023

k8s-ci-robot assigned ingvagabund May 2, 2023

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 2, 2023

k8s-ci-robot merged commit 5ba1fef into kubernetes-sigs:master May 2, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Do some code cleans. #1129

Do some code cleans. #1129

		@@ -140,33 +140,16 @@ func validateDeschedulerConfiguration(in api.DeschedulerPolicy, registry pluginr
		pluginUtilities := registry[pluginConfig.Name]

Do some code cleans. #1129

Do some code cleans. #1129

Conversation

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment