github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-17 11:28:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #135398 from xigang/quotadmission

Browse Source 
resourcequota: fix namespace GroupKind using wrong API group
This commit is contained in:
Kubernetes Prow Robot
2025-12-17 21:42:54 -08:00
committed by GitHub
parent 1a3d8712f3 01a69b68ea
commit 4c6855d3ec
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
staging/src/k8s.io/apiserver/pkg/admission/plugin/resourcequota/admission.go
View File

@@ -26,7 +26,6 @@ import (
"k8s.io/apiserver/pkg/admission"
genericadmissioninitializer "k8s.io/apiserver/pkg/admission/initializer"
resourcequotaapi "k8s.io/apiserver/pkg/admission/plugin/resourcequota/apis/resourcequota"
v1 "k8s.io/apiserver/pkg/admission/plugin/resourcequota/apis/resourcequota/v1"
"k8s.io/apiserver/pkg/admission/plugin/resourcequota/apis/resourcequota/validation"
quota "k8s.io/apiserver/pkg/quota/v1"
"k8s.io/apiserver/pkg/quota/v1/generic"
@@ -38,7 +37,7 @@ import (
const PluginName = "ResourceQuota"
var (
namespaceGVK = v1.SchemeGroupVersion.WithKind("Namespace").GroupKind()
namespaceGVK = corev1.SchemeGroupVersion.WithKind("Namespace").GroupKind()
stopChUnconfiguredErr = fmt.Errorf("quota configuration configured between stop channel")
)

3
staging/src/k8s.io/apiserver/pkg/admission/plugin/resourcequota/admission_test.go
View File

@@ -25,7 +25,6 @@ import (
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apiserver/pkg/admission"
v1 "k8s.io/apiserver/pkg/admission/plugin/resourcequota/apis/resourcequota/v1"
"k8s.io/apiserver/pkg/quota/v1/generic"
)
@@ -149,7 +148,7 @@ func TestExcludedOperations(t *testing.T) {
},
{
"namespace creation",
admission.NewAttributesRecord(nil, nil, v1.SchemeGroupVersion.WithKind("Namespace"), "namespace", "namespace", schema.GroupVersionResource{}, "", admission.Create, nil, false, nil),
admission.NewAttributesRecord(nil, nil, corev1.SchemeGroupVersion.WithKind("Namespace"), "namespace", "namespace", schema.GroupVersionResource{}, "", admission.Create, nil, false, nil),
},
}
for _, test := range testCases {