7297f48f12
Fix conversion errors Changed the order update update fix manaul coversions keep the global parameter for backward compatibility Address Wei's comments Fix an error Fix issues Add unit tests for validation Fix a comment Address comments Update comments fix verifiation errors Add tests for scheme_test.go Convert percentageOfNodesToScore to pointer Fix errors Resolve conflicts Fix testing errors Address Wei's comments Revert IntPtr to Int changes Address comments Not overrite percentageOfNodesToScore Fix a bug Fix a bug change errs to err Fix a nit Remove duplication Address comments Fix lint warning Fix an issue Update comments Clean up Address comments Revert changes to defaults fix unit test error Update Fix tests Use default PluginConfigs
114 lines
4.0 KiB
Go
114 lines
4.0 KiB
Go
/*
|
|
Copyright 2021 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 v1beta3
|
|
|
|
import (
|
|
"fmt"
|
|
"sync"
|
|
|
|
"k8s.io/apimachinery/pkg/conversion"
|
|
"k8s.io/apimachinery/pkg/runtime"
|
|
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
|
|
"k8s.io/kube-scheduler/config/v1beta3"
|
|
"k8s.io/kubernetes/pkg/scheduler/apis/config"
|
|
)
|
|
|
|
var (
|
|
// pluginArgConversionScheme is a scheme with internal and v1beta3 registered,
|
|
// used for defaulting/converting typed PluginConfig Args.
|
|
// Access via getPluginArgConversionScheme()
|
|
pluginArgConversionScheme *runtime.Scheme
|
|
initPluginArgConversionScheme sync.Once
|
|
)
|
|
|
|
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(config.AddToScheme(pluginArgConversionScheme))
|
|
})
|
|
return pluginArgConversionScheme
|
|
}
|
|
|
|
func Convert_v1beta3_KubeSchedulerConfiguration_To_config_KubeSchedulerConfiguration(in *v1beta3.KubeSchedulerConfiguration, out *config.KubeSchedulerConfiguration, s conversion.Scope) error {
|
|
if err := autoConvert_v1beta3_KubeSchedulerConfiguration_To_config_KubeSchedulerConfiguration(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 *config.KubeSchedulerConfiguration) error {
|
|
scheme := GetPluginArgConversionScheme()
|
|
for i := range out.Profiles {
|
|
prof := &out.Profiles[i]
|
|
for j := range prof.PluginConfig {
|
|
args := prof.PluginConfig[j].Args
|
|
if args == nil {
|
|
continue
|
|
}
|
|
if _, isUnknown := args.(*runtime.Unknown); isUnknown {
|
|
continue
|
|
}
|
|
internalArgs, err := scheme.ConvertToVersion(args, config.SchemeGroupVersion)
|
|
if err != nil {
|
|
return fmt.Errorf("converting .Profiles[%d].PluginConfig[%d].Args into internal type: %w", i, j, err)
|
|
}
|
|
prof.PluginConfig[j].Args = internalArgs
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func Convert_config_KubeSchedulerConfiguration_To_v1beta3_KubeSchedulerConfiguration(in *config.KubeSchedulerConfiguration, out *v1beta3.KubeSchedulerConfiguration, s conversion.Scope) error {
|
|
if err := autoConvert_config_KubeSchedulerConfiguration_To_v1beta3_KubeSchedulerConfiguration(in, out, s); err != nil {
|
|
return err
|
|
}
|
|
return convertToExternalPluginConfigArgs(out)
|
|
}
|
|
|
|
// convertToExternalPluginConfigArgs converts PluginConfig#Args into
|
|
// external (versioned) types using a scheme.
|
|
func convertToExternalPluginConfigArgs(out *v1beta3.KubeSchedulerConfiguration) error {
|
|
scheme := GetPluginArgConversionScheme()
|
|
for i := range out.Profiles {
|
|
for j := range out.Profiles[i].PluginConfig {
|
|
args := out.Profiles[i].PluginConfig[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].PluginConfig[j].Args.Object = externalArgs
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// Convert_config_KubeSchedulerProfile_To_v1beta3_KubeSchedulerProfile called auto coversion by
|
|
// ignoring per profile PercentageOfNodesToScore.
|
|
func Convert_config_KubeSchedulerProfile_To_v1beta3_KubeSchedulerProfile(in *config.KubeSchedulerProfile, out *v1beta3.KubeSchedulerProfile, s conversion.Scope) error {
|
|
return autoConvert_config_KubeSchedulerProfile_To_v1beta3_KubeSchedulerProfile(in, out, s)
|
|
}
|