Skip to content

Commit

Permalink
Merge pull request #104251 from ravisantoshgudimetla/scheduling-v1beta3
Browse files Browse the repository at this point in the history
Scheduling v1beta3
  • Loading branch information
k8s-ci-robot committed Oct 7, 2021
2 parents b0eac84 + 283b176 commit 9b45983
Show file tree
Hide file tree
Showing 33 changed files with 5,454 additions and 152 deletions.
5 changes: 4 additions & 1 deletion cmd/kube-scheduler/app/options/configfile.go
Expand Up @@ -28,6 +28,7 @@ import (
"k8s.io/kubernetes/pkg/scheduler/apis/config"
"k8s.io/kubernetes/pkg/scheduler/apis/config/scheme"
configv1beta2 "k8s.io/kubernetes/pkg/scheduler/apis/config/v1beta2"
configv1beta3 "k8s.io/kubernetes/pkg/scheduler/apis/config/v1beta3"
)

func loadConfigFromFile(file string) (*config.KubeSchedulerConfiguration, error) {
Expand Down Expand Up @@ -68,8 +69,10 @@ func encodeConfig(cfg *config.KubeSchedulerConfiguration) (*bytes.Buffer, error)
switch cfg.TypeMeta.APIVersion {
case configv1beta2.SchemeGroupVersion.String():
encoder = scheme.Codecs.EncoderForVersion(info.Serializer, configv1beta2.SchemeGroupVersion)
case configv1beta3.SchemeGroupVersion.String():
encoder = scheme.Codecs.EncoderForVersion(info.Serializer, configv1beta3.SchemeGroupVersion)
default:
encoder = scheme.Codecs.EncoderForVersion(info.Serializer, configv1beta2.SchemeGroupVersion)
encoder = scheme.Codecs.EncoderForVersion(info.Serializer, configv1beta3.SchemeGroupVersion)
}
if err := encoder.Encode(cfg, buf); err != nil {
return buf, err
Expand Down

0 comments on commit 9b45983

Please sign in to comment.