add v1alpha2 registry based conversion

pkg/api/conversion.go

@@ -0,0 +1,14 @@
+/*
+Copyright 2017 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 api

pkg/api/v1alpha1/conversion.go

@@ -0,0 +1,14 @@
+/*
+Copyright 2017 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 v1alpha1

pkg/api/v1alpha2/conversion.go

@@ -0,0 +1,140 @@
+/*
+Copyright 2017 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 v1alpha2
+
+import (
+ "fmt"
+ "sync"
+
+ // unsafe "unsafe"
+
+ "k8s.io/apimachinery/pkg/conversion"
+ "k8s.io/apimachinery/pkg/runtime"
+ "k8s.io/apimachinery/pkg/runtime/serializer"
+ utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+ api "sigs.k8s.io/descheduler/pkg/api"
+
+ // "sigs.k8s.io/descheduler/pkg/framework/plugins/defaultevictor"
+ "sigs.k8s.io/descheduler/pkg/framework/plugins/pluginregistry"
+ // "sigs.k8s.io/descheduler/pkg/framework/plugins/removepodshavingtoomanyrestarts"
+)
+
+var (
+ // pluginArgConversionScheme is a scheme with internal and v1beta2 registered,
+ // used for defaulting/converting typed PluginConfig Args.
+ // Access via getPluginArgConversionScheme()
+ pluginArgConversionScheme *runtime.Scheme
+ initPluginArgConversionScheme sync.Once
+
+ Scheme = runtime.NewScheme()
+ Codecs = serializer.NewCodecFactory(Scheme, serializer.EnableStrict)
+)
+
+func GetPluginArgConversionScheme() *runtime.Scheme {
+ initPluginArgConversionScheme.Do(func() {
+ // set up the scheme used for plugin arg conversion
+ pluginArgConversionScheme = runtime.NewScheme()
+ utilruntime.Must(AddToScheme(pluginArgConversionScheme))
+ utilruntime.Must(api.AddToScheme(pluginArgConversionScheme))
+ })
+ return pluginArgConversionScheme
+}
+
+func Convert_v1alpha2_DeschedulerPolicy_To_api_DeschedulerPolicy(in *DeschedulerPolicy, out *api.DeschedulerPolicy, s conversion.Scope) error {
+ if err := autoConvert_v1alpha2_DeschedulerPolicy_To_api_DeschedulerPolicy(in, out, s); err != nil {
+ return err
+ }
+ return convertToInternalPluginConfigArgs(out)
+}
+
+// convertToInternalPluginConfigArgs converts PluginConfig#Args into internal
+// types using a scheme, after applying defaults.
+func convertToInternalPluginConfigArgs(out *api.DeschedulerPolicy) error {
+ scheme := GetPluginArgConversionScheme()
+ for i := range out.Profiles {
+ prof := &out.Profiles[i]
+ for j := range prof.PluginConfigs {
+ args := prof.PluginConfigs[j].Args
+ if args == nil {
+ continue
+ }
+ if _, isUnknown := args.(*runtime.Unknown); isUnknown {
+ continue
+ }
+ internalArgs, err := scheme.ConvertToVersion(args, api.SchemeGroupVersion)
+ if err != nil {
+ err = nil
+ internalArgs = args
+ if err != nil {
+ return fmt.Errorf("converting .Profiles[%d].PluginConfigs[%d].Args into internal type: %w", i, j, err)
+ }
+ }
+ prof.PluginConfigs[j].Args = internalArgs
+ }
+ }
+ return nil
+}
+
+func Convert_v1alpha2_PluginConfig_To_api_PluginConfig(in *PluginConfig, out *api.PluginConfig, s conversion.Scope) error {
+ out.Name = in.Name
+ if _, ok := pluginregistry.PluginRegistry[in.Name]; ok {
+ out.Args = pluginregistry.PluginRegistry[in.Name].PluginArgInstance
+ if in.Args.Raw != nil {
+ _, _, err := Codecs.UniversalDecoder().Decode(in.Args.Raw, nil, out.Args)
+ if err != nil {
+ return err
+ }
+ } else if in.Args.Object != nil {
+ out.Args = in.Args.Object
+ }
+ } else {
+ if err := runtime.Convert_runtime_RawExtension_To_runtime_Object(&in.Args, &out.Args, s); err != nil {
+ return err
+ }
+ }
+ return nil
+}
+
+func Convert_api_DeschedulerPolicy_To_v1alpha2_DeschedulerPolicy(in *api.DeschedulerPolicy, out *DeschedulerPolicy, s conversion.Scope) error {
+ if err := autoConvert_api_DeschedulerPolicy_To_v1alpha2_DeschedulerPolicy(in, out, s); err != nil {
+ return err
+ }
+ return convertToExternalPluginConfigArgs(out)
+}
+
+// convertToExternalPluginConfigArgs converts PluginConfig#Args into
+// external (versioned) types using a scheme.
+func convertToExternalPluginConfigArgs(out *DeschedulerPolicy) error {
+ scheme := GetPluginArgConversionScheme()
+ for i := range out.Profiles {
+ for j := range out.Profiles[i].PluginConfigs {
+ args := out.Profiles[i].PluginConfigs[j].Args
+ if args.Object == nil {
+ continue
+ }
+ if _, isUnknown := args.Object.(*runtime.Unknown); isUnknown {
+ continue
+ }
+ externalArgs, err := scheme.ConvertToVersion(args.Object, SchemeGroupVersion)
+ if err != nil {
+ return err
+ }
+ out.Profiles[i].PluginConfigs[j].Args.Object = externalArgs
+ }
+ }
+ return nil
+}

pkg/api/v1alpha2/defaults.go

@@ -0,0 +1,20 @@
+/*
+Copyright 2017 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 v1alpha2
+
+import "k8s.io/apimachinery/pkg/runtime"
+
+func addDefaultingFuncs(scheme *runtime.Scheme) error {
+ return RegisterDefaults(scheme)
+}

pkg/api/v1alpha2/doc.go

@@ -0,0 +1,21 @@
+/*
+Copyright 2017 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:deepcopy-gen=package,register
+// +k8s:conversion-gen=sigs.k8s.io/descheduler/pkg/api
+// +k8s:defaulter-gen=TypeMeta
+
+// Package v1alpha2 is the v1alpha2 version of the descheduler API
+// +groupName=descheduler
+
+package v1alpha2 // import "sigs.k8s.io/descheduler/pkg/api/v1alpha2"

pkg/api/v1alpha2/register.go

@@ -0,0 +1,58 @@
+/*
+Copyright 2017 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 v1alpha2
+
+import (
+ "k8s.io/apimachinery/pkg/runtime"
+ "k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+var (
+ SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
+ localSchemeBuilder = &SchemeBuilder
+ AddToScheme = SchemeBuilder.AddToScheme
+)
+
+// GroupName is the group name used in this package
+const GroupName = "descheduler"
+const GroupVersion = "v1alpha2"
+
+// SchemeGroupVersion is group version used to register these objects
+var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: GroupVersion}
+
+// Kind takes an unqualified kind and returns a Group qualified GroupKind
+func Kind(kind string) schema.GroupKind {
+ return SchemeGroupVersion.WithKind(kind).GroupKind()
+}
+
+// Resource takes an unqualified resource and returns a Group qualified GroupResource
+func Resource(resource string) schema.GroupResource {
+ return SchemeGroupVersion.WithResource(resource).GroupResource()
+}
+
+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(addKnownTypes, addDefaultingFuncs)
+}
+
+func addKnownTypes(scheme *runtime.Scheme) error {
+ // TODO this will get cleaned up with the scheme types are fixed
+ scheme.AddKnownTypes(SchemeGroupVersion,
+ &DeschedulerPolicy{},
+ )
+
+ return nil
+}

pkg/api/v1alpha2/sort.go

@@ -0,0 +1,23 @@
+/*
+Copyright 2017 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 v1alpha2
+
+import "sort"
+
+func SortProfilesByName(profiles []Profile) []Profile {
+ sort.Slice(profiles, func(i, j int) bool {
+ return profiles[i].Name < profiles[j].Name
+ })
+ return profiles
+}

pkg/api/v1alpha2/types.go

@@ -0,0 +1,70 @@
+/*
+Copyright 2017 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 v1alpha2
+
+import (
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ "k8s.io/apimachinery/pkg/runtime"
+)
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+type DeschedulerPolicy struct {
+ metav1.TypeMeta `json:",inline"`
+
+ // Profiles
+ Profiles []Profile `json:"profiles,omitempty"`
+
+ // NodeSelector for a set of nodes to operate over
+ NodeSelector *string `json:"nodeSelector,omitempty"`
+
+ // MaxNoOfPodsToEvictPerNode restricts maximum of pods to be evicted per node.
+ MaxNoOfPodsToEvictPerNode *uint `json:"maxNoOfPodsToEvictPerNode,omitempty"`
+
+ // MaxNoOfPodsToEvictPerNamespace restricts maximum of pods to be evicted per namespace.
+ MaxNoOfPodsToEvictPerNamespace *uint `json:"maxNoOfPodsToEvictPerNamespace,omitempty"`
+}
+
+type Profile struct {
+ Name string `json:"name"`
+ PluginConfigs []PluginConfig `json:"pluginConfig"`
+ Plugins Plugins `json:"plugins"`
+}
+
+type Plugins struct {
+ PreSort PluginSet `json:"presort"`
+ Sort PluginSet `json:"sort"`
+ Deschedule PluginSet `json:"deschedule"`
+ Balance PluginSet `json:"balance"`
+ Evict PluginSet `json:"evict"`
+ Filter PluginSet `json:"filter"`
+ PreEvictionFilter PluginSet `json:"preevictionfilter"`
+}
+
+type PluginConfig struct {
+ Name string `json:"name"`
+ Args runtime.RawExtension `json:"args"`
+}
+
+type PluginSet struct {
+ Enabled []string `json:"enabled"`
+ Disabled []string `json:"disabled"`
+}
+
+// Namespaces carries a list of included/excluded namespaces
+// for which a given plugin is applicable.
+type Namespaces struct {
+ Include []string `json:"include"`
+ Exclude []string `json:"exclude"`
+}