From a665a7b4e6eae7c8830fcfe4cf056ae3a1d827fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?vlc=E5=88=98=E8=AF=9A?= Date: Thu, 22 Sep 2022 12:17:11 +0800 Subject: [PATCH] DefaultEvictorArgs defaulting --- .../plugins/defaultevictor/defaults.go | 51 ++++++++++++ .../plugins/defaultevictor/defaults_test.go | 83 +++++++++++++++++++ pkg/framework/plugins/defaultevictor/doc.go | 16 ++++ .../plugins/defaultevictor/register.go | 31 +++++++ .../defaultevictor/zz_generated.defaults.go | 38 +++++++++ 5 files changed, 219 insertions(+) create mode 100644 pkg/framework/plugins/defaultevictor/defaults.go create mode 100644 pkg/framework/plugins/defaultevictor/defaults_test.go create mode 100644 pkg/framework/plugins/defaultevictor/doc.go create mode 100644 pkg/framework/plugins/defaultevictor/register.go create mode 100644 pkg/framework/plugins/defaultevictor/zz_generated.defaults.go diff --git a/pkg/framework/plugins/defaultevictor/defaults.go b/pkg/framework/plugins/defaultevictor/defaults.go new file mode 100644 index 000000000..e1c26e708 --- /dev/null +++ b/pkg/framework/plugins/defaultevictor/defaults.go @@ -0,0 +1,51 @@ +/* +Copyright 2022 The Kubernetes Authors. +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package defaultevictor + +import ( + "k8s.io/apimachinery/pkg/runtime" +) + +func addDefaultingFuncs(scheme *runtime.Scheme) error { + return RegisterDefaults(scheme) +} + +// SetDefaults_DefaultEvictorArgs +// TODO: the final default values would be discussed in community +func SetDefaults_DefaultEvictorArgs(obj *DefaultEvictorArgs) { + if obj.NodeSelector == "" { + obj.NodeSelector = "" + } + if obj.EvictLocalStoragePods == false { + obj.EvictSystemCriticalPods = false + } + if obj.EvictSystemCriticalPods == false { + obj.EvictSystemCriticalPods = false + } + if obj.IgnorePvcPods == false { + obj.IgnorePvcPods = false + } + if obj.EvictFailedBarePods == false { + obj.EvictFailedBarePods = false + } + if obj.LabelSelector == nil { + obj.LabelSelector = nil + } + if obj.PriorityThreshold == nil { + obj.PriorityThreshold = nil + } + if obj.NodeFit == false { + obj.NodeFit = false + } +} diff --git a/pkg/framework/plugins/defaultevictor/defaults_test.go b/pkg/framework/plugins/defaultevictor/defaults_test.go new file mode 100644 index 000000000..2a4072be6 --- /dev/null +++ b/pkg/framework/plugins/defaultevictor/defaults_test.go @@ -0,0 +1,83 @@ +/* +Copyright 2022 The Kubernetes Authors. +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package defaultevictor + +import ( + "github.com/google/go-cmp/cmp" + "k8s.io/apimachinery/pkg/runtime" + utilruntime "k8s.io/apimachinery/pkg/util/runtime" + "k8s.io/utils/pointer" + "sigs.k8s.io/descheduler/pkg/api" + "testing" +) + +func TestSetDefaults_DefaultEvictorArgs(t *testing.T) { + tests := []struct { + name string + in runtime.Object + want runtime.Object + }{ + { + name: "DefaultEvictorArgs empty", + in: &DefaultEvictorArgs{}, + want: &DefaultEvictorArgs{ + NodeSelector: "", + EvictLocalStoragePods: false, + EvictSystemCriticalPods: false, + IgnorePvcPods: false, + EvictFailedBarePods: false, + LabelSelector: nil, + PriorityThreshold: nil, + NodeFit: false, + }, + }, + { + name: "DefaultEvictorArgs with value", + in: &DefaultEvictorArgs{ + NodeSelector: "NodeSelector", + EvictLocalStoragePods: true, + EvictSystemCriticalPods: true, + IgnorePvcPods: true, + EvictFailedBarePods: true, + LabelSelector: nil, + PriorityThreshold: &api.PriorityThreshold{ + Value: pointer.Int32(800), + }, + NodeFit: true, + }, + want: &DefaultEvictorArgs{ + NodeSelector: "NodeSelector", + EvictLocalStoragePods: true, + EvictSystemCriticalPods: true, + IgnorePvcPods: true, + EvictFailedBarePods: true, + LabelSelector: nil, + PriorityThreshold: &api.PriorityThreshold{ + Value: pointer.Int32(800), + }, + NodeFit: true, + }, + }, + } + for _, tc := range tests { + scheme := runtime.NewScheme() + utilruntime.Must(AddToScheme(scheme)) + t.Run(tc.name, func(t *testing.T) { + scheme.Default(tc.in) + if diff := cmp.Diff(tc.in, tc.want); diff != "" { + t.Errorf("Got unexpected defaults (-want, +got):\n%s", diff) + } + }) + } +} diff --git a/pkg/framework/plugins/defaultevictor/doc.go b/pkg/framework/plugins/defaultevictor/doc.go new file mode 100644 index 000000000..aee6a176f --- /dev/null +++ b/pkg/framework/plugins/defaultevictor/doc.go @@ -0,0 +1,16 @@ +/* +Copyright 2022 The Kubernetes Authors. +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// +k8s:defaulter-gen=TypeMeta + +package defaultevictor diff --git a/pkg/framework/plugins/defaultevictor/register.go b/pkg/framework/plugins/defaultevictor/register.go new file mode 100644 index 000000000..ded9f76c6 --- /dev/null +++ b/pkg/framework/plugins/defaultevictor/register.go @@ -0,0 +1,31 @@ +/* +Copyright 2022 The Kubernetes Authors. +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package defaultevictor + +import ( + "k8s.io/apimachinery/pkg/runtime" +) + +var ( + SchemeBuilder = runtime.NewSchemeBuilder() + localSchemeBuilder = &SchemeBuilder + AddToScheme = localSchemeBuilder.AddToScheme +) + +func init() { + // We only register manually written functions here. The registration of the + // generated functions takes place in the generated files. The separation + // makes the code compile even when the generated files are missing. + localSchemeBuilder.Register(addDefaultingFuncs) +} diff --git a/pkg/framework/plugins/defaultevictor/zz_generated.defaults.go b/pkg/framework/plugins/defaultevictor/zz_generated.defaults.go new file mode 100644 index 000000000..6e662a5a9 --- /dev/null +++ b/pkg/framework/plugins/defaultevictor/zz_generated.defaults.go @@ -0,0 +1,38 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright 2022 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by defaulter-gen. DO NOT EDIT. + +package defaultevictor + +import ( + runtime "k8s.io/apimachinery/pkg/runtime" +) + +// RegisterDefaults adds defaulters functions to the given scheme. +// Public to allow building arbitrary schemes. +// All generated defaulters are covering - they call all nested defaulters. +func RegisterDefaults(scheme *runtime.Scheme) error { + scheme.AddTypeDefaultingFunc(&DefaultEvictorArgs{}, func(obj interface{}) { SetObjectDefaults_DefaultEvictorArgs(obj.(*DefaultEvictorArgs)) }) + return nil +} + +func SetObjectDefaults_DefaultEvictorArgs(in *DefaultEvictorArgs) { + SetDefaults_DefaultEvictorArgs(in) +}