Merge pull request #72664 from sbezverk/ResourceQuotaScopeSelectors

Move ResourceQuotaSelector out of validation
This commit is contained in:
Kubernetes Prow Robot
2019-01-08 02:02:59 -08:00
committed by GitHub
8 changed files with 203 additions and 9 deletions

View File

@@ -15,6 +15,7 @@ go_library(
importpath = "k8s.io/kubernetes/pkg/registry/core/resourcequota",
deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/api/resourcequota:go_default_library",
"//pkg/apis/core:go_default_library",
"//pkg/apis/core/validation:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",

View File

@@ -23,6 +23,7 @@ import (
"k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/apiserver/pkg/storage/names"
"k8s.io/kubernetes/pkg/api/legacyscheme"
resourcequotautil "k8s.io/kubernetes/pkg/api/resourcequota"
api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/apis/core/validation"
)
@@ -46,6 +47,7 @@ func (resourcequotaStrategy) NamespaceScoped() bool {
func (resourcequotaStrategy) PrepareForCreate(ctx context.Context, obj runtime.Object) {
resourcequota := obj.(*api.ResourceQuota)
resourcequota.Status = api.ResourceQuotaStatus{}
resourcequotautil.DropDisabledFields(&resourcequota.Spec, nil)
}
// PrepareForUpdate clears fields that are not allowed to be set by end users on update.
@@ -53,6 +55,7 @@ func (resourcequotaStrategy) PrepareForUpdate(ctx context.Context, obj, old runt
newResourcequota := obj.(*api.ResourceQuota)
oldResourcequota := old.(*api.ResourceQuota)
newResourcequota.Status = oldResourcequota.Status
resourcequotautil.DropDisabledFields(&newResourcequota.Spec, &oldResourcequota.Spec)
}
// Validate validates a new resourcequota.