New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add kubescheduler.config.k8s.io/v1alpha2 #87628
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") | ||
|
|
||
| go_library( | ||
| name = "go_default_library", | ||
| srcs = [ | ||
| "conversion.go", | ||
| "defaults.go", | ||
| "doc.go", | ||
| "register.go", | ||
| "zz_generated.conversion.go", | ||
| "zz_generated.deepcopy.go", | ||
| "zz_generated.defaults.go", | ||
| ], | ||
| importpath = "k8s.io/kubernetes/pkg/scheduler/apis/config/v1alpha2", | ||
| visibility = ["//visibility:public"], | ||
| deps = [ | ||
| "//pkg/apis/core:go_default_library", | ||
| "//pkg/master/ports:go_default_library", | ||
| "//pkg/scheduler/apis/config:go_default_library", | ||
| "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", | ||
| "//staging/src/k8s.io/apimachinery/pkg/conversion:go_default_library", | ||
| "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", | ||
| "//staging/src/k8s.io/component-base/config/v1alpha1:go_default_library", | ||
| "//staging/src/k8s.io/kube-scheduler/config/v1alpha2:go_default_library", | ||
| ], | ||
| ) | ||
|
|
||
| go_test( | ||
| name = "go_default_test", | ||
| srcs = [ | ||
| "conversion_test.go", | ||
| "defaults_test.go", | ||
| ], | ||
| embed = [":go_default_library"], | ||
| deps = [ | ||
| "//pkg/scheduler/apis/config:go_default_library", | ||
| "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", | ||
| "//staging/src/k8s.io/apimachinery/pkg/conversion:go_default_library", | ||
| "//staging/src/k8s.io/component-base/config:go_default_library", | ||
| "//staging/src/k8s.io/component-base/config/v1alpha1:go_default_library", | ||
| "//staging/src/k8s.io/kube-scheduler/config/v1alpha2:go_default_library", | ||
| "//vendor/k8s.io/utils/pointer:go_default_library", | ||
| ], | ||
| ) | ||
|
|
||
| filegroup( | ||
| name = "package-srcs", | ||
| srcs = glob(["**"]), | ||
| tags = ["automanaged"], | ||
| visibility = ["//visibility:private"], | ||
| ) | ||
|
|
||
| filegroup( | ||
| name = "all-srcs", | ||
| srcs = [":package-srcs"], | ||
| tags = ["automanaged"], | ||
| visibility = ["//visibility:public"], | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| /* | ||
| Copyright 2020 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" | ||
|
|
||
| "k8s.io/apimachinery/pkg/conversion" | ||
| "k8s.io/kube-scheduler/config/v1alpha2" | ||
| "k8s.io/kubernetes/pkg/scheduler/apis/config" | ||
| ) | ||
|
|
||
| // Convert_v1alpha2_KubeSchedulerLeaderElectionConfiguration_To_config_KubeSchedulerLeaderElectionConfiguration is an autogenerated conversion function. | ||
| func Convert_v1alpha2_KubeSchedulerLeaderElectionConfiguration_To_config_KubeSchedulerLeaderElectionConfiguration(in *v1alpha2.KubeSchedulerLeaderElectionConfiguration, out *config.KubeSchedulerLeaderElectionConfiguration, s conversion.Scope) error { | ||
| if err := autoConvert_v1alpha2_KubeSchedulerLeaderElectionConfiguration_To_config_KubeSchedulerLeaderElectionConfiguration(in, out, s); err != nil { | ||
| return err | ||
| } | ||
| if len(in.ResourceNamespace) > 0 && len(in.LockObjectNamespace) == 0 { | ||
| out.ResourceNamespace = in.ResourceNamespace | ||
| } else if len(in.ResourceNamespace) == 0 && len(in.LockObjectNamespace) > 0 { | ||
| out.ResourceNamespace = in.LockObjectNamespace | ||
| } else if len(in.ResourceNamespace) > 0 && len(in.LockObjectNamespace) > 0 { | ||
| if in.ResourceNamespace == in.LockObjectNamespace { | ||
| out.ResourceNamespace = in.ResourceNamespace | ||
| } else { | ||
| return fmt.Errorf("ResourceNamespace and LockObjectNamespace are both set and do not match, ResourceNamespace: %s, LockObjectNamespace: %s", in.ResourceNamespace, in.LockObjectNamespace) | ||
| } | ||
| } | ||
|
|
||
| if len(in.ResourceName) > 0 && len(in.LockObjectName) == 0 { | ||
| out.ResourceName = in.ResourceName | ||
| } else if len(in.ResourceName) == 0 && len(in.LockObjectName) > 0 { | ||
| out.ResourceName = in.LockObjectName | ||
| } else if len(in.ResourceName) > 0 && len(in.LockObjectName) > 0 { | ||
| if in.ResourceName == in.LockObjectName { | ||
| out.ResourceName = in.ResourceName | ||
| } else { | ||
| return fmt.Errorf("ResourceName and LockObjectName are both set and do not match, ResourceName: %s, LockObjectName: %s", in.ResourceName, in.LockObjectName) | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| // Convert_config_KubeSchedulerLeaderElectionConfiguration_To_v1alpha2_KubeSchedulerLeaderElectionConfiguration is an autogenerated conversion function. | ||
| func Convert_config_KubeSchedulerLeaderElectionConfiguration_To_v1alpha2_KubeSchedulerLeaderElectionConfiguration(in *config.KubeSchedulerLeaderElectionConfiguration, out *v1alpha2.KubeSchedulerLeaderElectionConfiguration, s conversion.Scope) error { | ||
| if err := autoConvert_config_KubeSchedulerLeaderElectionConfiguration_To_v1alpha2_KubeSchedulerLeaderElectionConfiguration(in, out, s); err != nil { | ||
| return err | ||
| } | ||
| out.ResourceNamespace = in.ResourceNamespace | ||
| out.LockObjectNamespace = in.ResourceNamespace | ||
| out.ResourceName = in.ResourceName | ||
| out.LockObjectName = in.ResourceName | ||
| return nil | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't know when this is invoked but this doesn't look rollback safe.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is only used for debugging purposes.
If you specify an output config file, we produce it and then exit the binary. This way a dev can verify defaults and/or validation is applied properly.
So, this should be safe, as everything will be converted to v1alpha2 internally.