diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 7e3a2bb9450..19da3fc7c95 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -357,7 +357,7 @@ const ( // Kubelet uses the new Lease API to report node heartbeats, // (Kube) Node Lifecycle Controller uses these heartbeats as a node health signal. NodeLease utilfeature.Feature = "NodeLease" - + // owner: @janosi // alpha: v1.12 // diff --git a/pkg/scheduler/apis/config/v1alpha1/zz_generated.conversion.go b/pkg/scheduler/apis/config/v1alpha1/zz_generated.conversion.go index 3c7b420d94a..296bc15f04f 100644 --- a/pkg/scheduler/apis/config/v1alpha1/zz_generated.conversion.go +++ b/pkg/scheduler/apis/config/v1alpha1/zz_generated.conversion.go @@ -23,10 +23,8 @@ package v1alpha1 import ( unsafe "unsafe" - configv1alpha1 "k8s.io/apimachinery/pkg/apis/config/v1alpha1" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - apisconfigv1alpha1 "k8s.io/apiserver/pkg/apis/config/v1alpha1" v1alpha1 "k8s.io/kube-scheduler/config/v1alpha1" config "k8s.io/kubernetes/pkg/scheduler/apis/config" ) @@ -110,12 +108,14 @@ func autoConvert_v1alpha1_KubeSchedulerConfiguration_To_config_KubeSchedulerConf if err := Convert_v1alpha1_KubeSchedulerLeaderElectionConfiguration_To_config_KubeSchedulerLeaderElectionConfiguration(&in.LeaderElection, &out.LeaderElection, s); err != nil { return err } - if err := configv1alpha1.Convert_v1alpha1_ClientConnectionConfiguration_To_config_ClientConnectionConfiguration(&in.ClientConnection, &out.ClientConnection, s); err != nil { + // TODO: Inefficient conversion - can we improve it? + if err := s.Convert(&in.ClientConnection, &out.ClientConnection, 0); err != nil { return err } out.HealthzBindAddress = in.HealthzBindAddress out.MetricsBindAddress = in.MetricsBindAddress - if err := apisconfigv1alpha1.Convert_v1alpha1_DebuggingConfiguration_To_config_DebuggingConfiguration(&in.DebuggingConfiguration, &out.DebuggingConfiguration, s); err != nil { + // TODO: Inefficient conversion - can we improve it? + if err := s.Convert(&in.DebuggingConfiguration, &out.DebuggingConfiguration, 0); err != nil { return err } out.DisablePreemption = in.DisablePreemption @@ -138,12 +138,14 @@ func autoConvert_config_KubeSchedulerConfiguration_To_v1alpha1_KubeSchedulerConf if err := Convert_config_KubeSchedulerLeaderElectionConfiguration_To_v1alpha1_KubeSchedulerLeaderElectionConfiguration(&in.LeaderElection, &out.LeaderElection, s); err != nil { return err } - if err := configv1alpha1.Convert_config_ClientConnectionConfiguration_To_v1alpha1_ClientConnectionConfiguration(&in.ClientConnection, &out.ClientConnection, s); err != nil { + // TODO: Inefficient conversion - can we improve it? + if err := s.Convert(&in.ClientConnection, &out.ClientConnection, 0); err != nil { return err } out.HealthzBindAddress = in.HealthzBindAddress out.MetricsBindAddress = in.MetricsBindAddress - if err := apisconfigv1alpha1.Convert_config_DebuggingConfiguration_To_v1alpha1_DebuggingConfiguration(&in.DebuggingConfiguration, &out.DebuggingConfiguration, s); err != nil { + // TODO: Inefficient conversion - can we improve it? + if err := s.Convert(&in.DebuggingConfiguration, &out.DebuggingConfiguration, 0); err != nil { return err } out.DisablePreemption = in.DisablePreemption @@ -158,7 +160,8 @@ func Convert_config_KubeSchedulerConfiguration_To_v1alpha1_KubeSchedulerConfigur } func autoConvert_v1alpha1_KubeSchedulerLeaderElectionConfiguration_To_config_KubeSchedulerLeaderElectionConfiguration(in *v1alpha1.KubeSchedulerLeaderElectionConfiguration, out *config.KubeSchedulerLeaderElectionConfiguration, s conversion.Scope) error { - if err := apisconfigv1alpha1.Convert_v1alpha1_LeaderElectionConfiguration_To_config_LeaderElectionConfiguration(&in.LeaderElectionConfiguration, &out.LeaderElectionConfiguration, s); err != nil { + // TODO: Inefficient conversion - can we improve it? + if err := s.Convert(&in.LeaderElectionConfiguration, &out.LeaderElectionConfiguration, 0); err != nil { return err } out.LockObjectNamespace = in.LockObjectNamespace @@ -172,7 +175,8 @@ func Convert_v1alpha1_KubeSchedulerLeaderElectionConfiguration_To_config_KubeSch } func autoConvert_config_KubeSchedulerLeaderElectionConfiguration_To_v1alpha1_KubeSchedulerLeaderElectionConfiguration(in *config.KubeSchedulerLeaderElectionConfiguration, out *v1alpha1.KubeSchedulerLeaderElectionConfiguration, s conversion.Scope) error { - if err := apisconfigv1alpha1.Convert_config_LeaderElectionConfiguration_To_v1alpha1_LeaderElectionConfiguration(&in.LeaderElectionConfiguration, &out.LeaderElectionConfiguration, s); err != nil { + // TODO: Inefficient conversion - can we improve it? + if err := s.Convert(&in.LeaderElectionConfiguration, &out.LeaderElectionConfiguration, 0); err != nil { return err } out.LockObjectNamespace = in.LockObjectNamespace