From 63396d4afca141170d2cd0110a6030855a9c9f51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?vlc=E5=88=98=E8=AF=9A?= Date: Thu, 22 Sep 2022 14:05:07 +0800 Subject: [PATCH] RemoveFailedPodsArgs defaulting --- .../plugins/removefailedpods/defaults.go | 45 +++++++++++ .../plugins/removefailedpods/defaults_test.go | 74 +++++++++++++++++++ pkg/framework/plugins/removefailedpods/doc.go | 16 ++++ .../plugins/removefailedpods/register.go | 31 ++++++++ .../removefailedpods/zz_generated.defaults.go | 38 ++++++++++ 5 files changed, 204 insertions(+) create mode 100644 pkg/framework/plugins/removefailedpods/defaults.go create mode 100644 pkg/framework/plugins/removefailedpods/defaults_test.go create mode 100644 pkg/framework/plugins/removefailedpods/doc.go create mode 100644 pkg/framework/plugins/removefailedpods/register.go create mode 100644 pkg/framework/plugins/removefailedpods/zz_generated.defaults.go diff --git a/pkg/framework/plugins/removefailedpods/defaults.go b/pkg/framework/plugins/removefailedpods/defaults.go new file mode 100644 index 000000000..9b40255b8 --- /dev/null +++ b/pkg/framework/plugins/removefailedpods/defaults.go @@ -0,0 +1,45 @@ +/* +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 removefailedpods + +import ( + "k8s.io/apimachinery/pkg/runtime" +) + +func addDefaultingFuncs(scheme *runtime.Scheme) error { + return RegisterDefaults(scheme) +} + +// SetDefaults_RemoveFailedPodsArgs +// TODO: the final default values would be discussed in community +func SetDefaults_RemoveFailedPodsArgs(obj *RemoveFailedPodsArgs) { + if obj.Namespaces == nil { + obj.Namespaces = nil + } + if obj.LabelSelector == nil { + obj.LabelSelector = nil + } + if obj.ExcludeOwnerKinds == nil { + obj.ExcludeOwnerKinds = nil + } + if obj.MinPodLifetimeSeconds == nil { + obj.MinPodLifetimeSeconds = nil + } + if obj.Reasons == nil { + obj.Reasons = nil + } + if obj.IncludingInitContainers == false { + obj.IncludingInitContainers = false + } +} diff --git a/pkg/framework/plugins/removefailedpods/defaults_test.go b/pkg/framework/plugins/removefailedpods/defaults_test.go new file mode 100644 index 000000000..dfef43736 --- /dev/null +++ b/pkg/framework/plugins/removefailedpods/defaults_test.go @@ -0,0 +1,74 @@ +/* +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 removefailedpods + +import ( + "github.com/google/go-cmp/cmp" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "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_RemoveFailedPodsArgs(t *testing.T) { + tests := []struct { + name string + in runtime.Object + want runtime.Object + }{ + { + name: "RemoveFailedPodsArgs empty", + in: &RemoveFailedPodsArgs{}, + want: &RemoveFailedPodsArgs{ + Namespaces: nil, + LabelSelector: nil, + ExcludeOwnerKinds: nil, + MinPodLifetimeSeconds: nil, + Reasons: nil, + IncludingInitContainers: false, + }, + }, + { + name: "RemoveFailedPodsArgs with value", + in: &RemoveFailedPodsArgs{ + Namespaces: &api.Namespaces{}, + LabelSelector: &metav1.LabelSelector{}, + ExcludeOwnerKinds: []string{"ReplicaSet"}, + MinPodLifetimeSeconds: pointer.Uint(0), + Reasons: []string{"reason"}, + IncludingInitContainers: true, + }, + want: &RemoveFailedPodsArgs{ + Namespaces: &api.Namespaces{}, + LabelSelector: &metav1.LabelSelector{}, + ExcludeOwnerKinds: []string{"ReplicaSet"}, + MinPodLifetimeSeconds: pointer.Uint(0), + Reasons: []string{"reason"}, + IncludingInitContainers: 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/removefailedpods/doc.go b/pkg/framework/plugins/removefailedpods/doc.go new file mode 100644 index 000000000..3951b1d10 --- /dev/null +++ b/pkg/framework/plugins/removefailedpods/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 removefailedpods diff --git a/pkg/framework/plugins/removefailedpods/register.go b/pkg/framework/plugins/removefailedpods/register.go new file mode 100644 index 000000000..3a8559510 --- /dev/null +++ b/pkg/framework/plugins/removefailedpods/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 removefailedpods + +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/removefailedpods/zz_generated.defaults.go b/pkg/framework/plugins/removefailedpods/zz_generated.defaults.go new file mode 100644 index 000000000..62c6d8052 --- /dev/null +++ b/pkg/framework/plugins/removefailedpods/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 removefailedpods + +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(&RemoveFailedPodsArgs{}, func(obj interface{}) { SetObjectDefaults_RemoveFailedPodsArgs(obj.(*RemoveFailedPodsArgs)) }) + return nil +} + +func SetObjectDefaults_RemoveFailedPodsArgs(in *RemoveFailedPodsArgs) { + SetDefaults_RemoveFailedPodsArgs(in) +}