-
Notifications
You must be signed in to change notification settings - Fork 38.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add CrossNamespacePodAffinity quota scope and PodAffinityTerm.Namespa…
…ceSelector APIs
- Loading branch information
Showing
87 changed files
with
6,128 additions
and
3,660 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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,40 @@ | ||
| load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") | ||
|
|
||
| go_library( | ||
| name = "go_default_library", | ||
| srcs = ["util.go"], | ||
| importpath = "k8s.io/kubernetes/pkg/api/resourcequota", | ||
| visibility = ["//visibility:public"], | ||
| deps = [ | ||
| "//pkg/apis/core:go_default_library", | ||
| "//pkg/features:go_default_library", | ||
| "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", | ||
| ], | ||
| ) | ||
|
|
||
| go_test( | ||
| name = "go_default_test", | ||
| srcs = ["util_test.go"], | ||
| embed = [":go_default_library"], | ||
| deps = [ | ||
| "//pkg/apis/core:go_default_library", | ||
| "//pkg/features:go_default_library", | ||
| "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", | ||
| "//staging/src/k8s.io/component-base/featuregate/testing:go_default_library", | ||
| "//vendor/github.com/google/go-cmp/cmp: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,75 @@ | ||
| /* | ||
| 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 resourcequota | ||
|
|
||
| import ( | ||
| utilfeature "k8s.io/apiserver/pkg/util/feature" | ||
| api "k8s.io/kubernetes/pkg/apis/core" | ||
| "k8s.io/kubernetes/pkg/features" | ||
| ) | ||
|
|
||
| // DropDisabledFields removes disabled fields from the ResourceQuota spec. | ||
| // This should be called from PrepareForCreate/PrepareForUpdate for all resources | ||
| // containing a ResourceQuota spec. | ||
| func DropDisabledFields(newResSpec, oldResSpec *api.ResourceQuotaSpec) { | ||
| if utilfeature.DefaultFeatureGate.Enabled(features.PodAffinityNamespaceSelector) || newResSpec == nil { | ||
| return | ||
| } | ||
| if len(newResSpec.Scopes) != 0 && !crossNamespaceScopeInUse(oldResSpec) { | ||
| var scopes []api.ResourceQuotaScope | ||
| for _, s := range newResSpec.Scopes { | ||
| if s != api.ResourceQuotaScopeCrossNamespacePodAffinity { | ||
| scopes = append(scopes, s) | ||
| } | ||
| } | ||
| newResSpec.Scopes = scopes | ||
| } | ||
| if newResSpec.ScopeSelector != nil && len(newResSpec.ScopeSelector.MatchExpressions) != 0 && | ||
| !crossNamespaceScopeSelectorInUse(oldResSpec) { | ||
| var expressions []api.ScopedResourceSelectorRequirement | ||
| for _, e := range newResSpec.ScopeSelector.MatchExpressions { | ||
| if e.ScopeName != api.ResourceQuotaScopeCrossNamespacePodAffinity { | ||
| expressions = append(expressions, e) | ||
| } | ||
| } | ||
| newResSpec.ScopeSelector.MatchExpressions = expressions | ||
| } | ||
| } | ||
|
|
||
| func crossNamespaceScopeInUse(resSpec *api.ResourceQuotaSpec) bool { | ||
| if resSpec == nil { | ||
| return false | ||
| } | ||
| for _, s := range resSpec.Scopes { | ||
| if s == api.ResourceQuotaScopeCrossNamespacePodAffinity { | ||
| return true | ||
| } | ||
| } | ||
| return false | ||
| } | ||
|
|
||
| func crossNamespaceScopeSelectorInUse(resSpec *api.ResourceQuotaSpec) bool { | ||
| if resSpec == nil || resSpec.ScopeSelector == nil { | ||
| return false | ||
| } | ||
| for _, m := range resSpec.ScopeSelector.MatchExpressions { | ||
| if m.ScopeName == api.ResourceQuotaScopeCrossNamespacePodAffinity { | ||
| return true | ||
| } | ||
| } | ||
| return false | ||
| } |
Oops, something went wrong.