Merge pull request #82690 from draveness/feature/graduate-ResourceQuotaScopeSelectors-to-ga
feat: graduate ResourceQuotaScopeSelectors to GA - part2
This commit is contained in:
@@ -15,7 +15,6 @@ 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",
|
||||
|
||||
@@ -23,7 +23,6 @@ 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"
|
||||
)
|
||||
@@ -47,7 +46,6 @@ 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.
|
||||
@@ -55,7 +53,6 @@ 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.
|
||||
|
||||
Reference in New Issue
Block a user