Skip to content

Commit e7b9453

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#93537 from timuthy/enhancement.move-resourcequota
Move ResourceQuota admission to k8s.io/apiserver lib
2 parents 396dd25 + cc0b86f commit e7b9453

File tree

87 files changed

+749
-628
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+749
-628
lines changed

‎cmd/kube-controller-manager/app/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ go_library(
8181
"//pkg/controller/volume/pvcprotection:go_default_library",
8282
"//pkg/controller/volume/pvprotection:go_default_library",
8383
"//pkg/features:go_default_library",
84-
"//pkg/quota/v1/generic:go_default_library",
8584
"//pkg/quota/v1/install:go_default_library",
8685
"//pkg/serviceaccount:go_default_library",
8786
"//pkg/volume:go_default_library",
@@ -114,6 +113,7 @@ go_library(
114113
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
115114
"//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
116115
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
116+
"//staging/src/k8s.io/apiserver/pkg/quota/v1/generic:go_default_library",
117117
"//staging/src/k8s.io/apiserver/pkg/server:go_default_library",
118118
"//staging/src/k8s.io/apiserver/pkg/server/healthz:go_default_library",
119119
"//staging/src/k8s.io/apiserver/pkg/server/mux:go_default_library",

‎cmd/kube-controller-manager/app/core.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232

3333
v1 "k8s.io/api/core/v1"
3434
"k8s.io/apimachinery/pkg/runtime/schema"
35+
"k8s.io/apiserver/pkg/quota/v1/generic"
3536
utilfeature "k8s.io/apiserver/pkg/util/feature"
3637
storagev1informer "k8s.io/client-go/informers/storage/v1"
3738
clientset "k8s.io/client-go/kubernetes"
@@ -63,7 +64,6 @@ import (
6364
"k8s.io/kubernetes/pkg/controller/volume/pvcprotection"
6465
"k8s.io/kubernetes/pkg/controller/volume/pvprotection"
6566
"k8s.io/kubernetes/pkg/features"
66-
"k8s.io/kubernetes/pkg/quota/v1/generic"
6767
quotainstall "k8s.io/kubernetes/pkg/quota/v1/install"
6868
"k8s.io/kubernetes/pkg/volume/csimigration"
6969
netutils "k8s.io/utils/net"

‎hack/.golint_failures‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,6 @@ pkg/volume/util/volumepathhandler
195195
pkg/volume/vsphere_volume
196196
plugin/pkg/admission/eventratelimit/apis/eventratelimit/v1alpha1
197197
plugin/pkg/admission/limitranger
198-
plugin/pkg/admission/resourcequota/apis/resourcequota/v1
199-
plugin/pkg/admission/resourcequota/apis/resourcequota/v1alpha1
200-
plugin/pkg/admission/resourcequota/apis/resourcequota/v1beta1
201198
plugin/pkg/auth/authorizer/node
202199
plugin/pkg/auth/authorizer/rbac
203200
staging/src/k8s.io/api/admission/v1
@@ -293,6 +290,9 @@ staging/src/k8s.io/apimachinery/pkg/watch
293290
staging/src/k8s.io/apiserver/pkg/admission
294291
staging/src/k8s.io/apiserver/pkg/admission/configuration
295292
staging/src/k8s.io/apiserver/pkg/admission/initializer
293+
staging/src/k8s.io/apiserver/pkg/admission/plugin/resourcequota/apis/resourcequota/v1
294+
staging/src/k8s.io/apiserver/pkg/admission/plugin/resourcequota/apis/resourcequota/v1alpha1
295+
staging/src/k8s.io/apiserver/pkg/admission/plugin/resourcequota/apis/resourcequota/v1beta1
296296
staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook
297297
staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission
298298
staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission/v1

‎pkg/controller/resourcequota/BUILD‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ go_library(
1616
importpath = "k8s.io/kubernetes/pkg/controller/resourcequota",
1717
deps = [
1818
"//pkg/controller:go_default_library",
19-
"//pkg/quota/v1:go_default_library",
2019
"//pkg/quota/v1/evaluator/core:go_default_library",
21-
"//pkg/quota/v1/generic:go_default_library",
2220
"//staging/src/k8s.io/api/core/v1:go_default_library",
2321
"//staging/src/k8s.io/apimachinery/pkg/api/equality:go_default_library",
2422
"//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
@@ -31,6 +29,8 @@ go_library(
3129
"//staging/src/k8s.io/apimachinery/pkg/util/runtime:go_default_library",
3230
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
3331
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
32+
"//staging/src/k8s.io/apiserver/pkg/quota/v1:go_default_library",
33+
"//staging/src/k8s.io/apiserver/pkg/quota/v1/generic:go_default_library",
3434
"//staging/src/k8s.io/client-go/discovery:go_default_library",
3535
"//staging/src/k8s.io/client-go/informers/core/v1:go_default_library",
3636
"//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
@@ -47,8 +47,6 @@ go_test(
4747
embed = [":go_default_library"],
4848
deps = [
4949
"//pkg/controller:go_default_library",
50-
"//pkg/quota/v1:go_default_library",
51-
"//pkg/quota/v1/generic:go_default_library",
5250
"//pkg/quota/v1/install:go_default_library",
5351
"//staging/src/k8s.io/api/core/v1:go_default_library",
5452
"//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",
@@ -57,6 +55,8 @@ go_test(
5755
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
5856
"//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
5957
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
58+
"//staging/src/k8s.io/apiserver/pkg/quota/v1:go_default_library",
59+
"//staging/src/k8s.io/apiserver/pkg/quota/v1/generic:go_default_library",
6060
"//staging/src/k8s.io/client-go/informers:go_default_library",
6161
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
6262
"//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library",

‎pkg/controller/resourcequota/resource_quota_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ import (
3535
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
3636
"k8s.io/apimachinery/pkg/util/sets"
3737
"k8s.io/apimachinery/pkg/util/wait"
38+
quota "k8s.io/apiserver/pkg/quota/v1"
3839
"k8s.io/client-go/discovery"
3940
coreinformers "k8s.io/client-go/informers/core/v1"
4041
corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
4142
corelisters "k8s.io/client-go/listers/core/v1"
4243
"k8s.io/client-go/tools/cache"
4344
"k8s.io/client-go/util/workqueue"
4445
"k8s.io/kubernetes/pkg/controller"
45-
"k8s.io/kubernetes/pkg/quota/v1"
4646
)
4747

4848
// NamespacedResourcesFunc knows how to discover namespaced resources.

‎pkg/controller/resourcequota/resource_quota_controller_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,22 @@ import (
2525
"testing"
2626
"time"
2727

28-
v1 "k8s.io/api/core/v1"
28+
"k8s.io/api/core/v1"
2929
"k8s.io/apimachinery/pkg/api/resource"
3030
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3131
"k8s.io/apimachinery/pkg/labels"
3232
"k8s.io/apimachinery/pkg/runtime"
3333
"k8s.io/apimachinery/pkg/runtime/schema"
3434
"k8s.io/apimachinery/pkg/util/sets"
35+
quota "k8s.io/apiserver/pkg/quota/v1"
36+
"k8s.io/apiserver/pkg/quota/v1/generic"
3537
"k8s.io/client-go/informers"
3638
"k8s.io/client-go/kubernetes"
3739
"k8s.io/client-go/kubernetes/fake"
3840
"k8s.io/client-go/rest"
3941
core "k8s.io/client-go/testing"
4042
"k8s.io/client-go/tools/cache"
4143
"k8s.io/kubernetes/pkg/controller"
42-
"k8s.io/kubernetes/pkg/quota/v1"
43-
"k8s.io/kubernetes/pkg/quota/v1/generic"
4444
"k8s.io/kubernetes/pkg/quota/v1/install"
4545
)
4646

‎pkg/controller/resourcequota/resource_quota_monitor.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ import (
3030
utilerrors "k8s.io/apimachinery/pkg/util/errors"
3131
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
3232
"k8s.io/apimachinery/pkg/util/wait"
33+
quota "k8s.io/apiserver/pkg/quota/v1"
34+
"k8s.io/apiserver/pkg/quota/v1/generic"
3335
"k8s.io/client-go/tools/cache"
3436
"k8s.io/client-go/util/workqueue"
3537
"k8s.io/kubernetes/pkg/controller"
36-
"k8s.io/kubernetes/pkg/quota/v1"
3738
"k8s.io/kubernetes/pkg/quota/v1/evaluator/core"
38-
"k8s.io/kubernetes/pkg/quota/v1/generic"
3939
)
4040

4141
type eventType int

‎pkg/kubeapiserver/admission/BUILD‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@ go_library(
99
importpath = "k8s.io/kubernetes/pkg/kubeapiserver/admission",
1010
visibility = ["//visibility:public"],
1111
deps = [
12-
"//pkg/quota/v1:go_default_library",
1312
"//pkg/quota/v1/install:go_default_library",
1413
"//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library",
1514
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
1615
"//staging/src/k8s.io/apiserver/pkg/admission:go_default_library",
16+
"//staging/src/k8s.io/apiserver/pkg/admission/initializer:go_default_library",
1717
"//staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/initializer:go_default_library",
18+
"//staging/src/k8s.io/apiserver/pkg/quota/v1:go_default_library",
1819
"//staging/src/k8s.io/apiserver/pkg/server:go_default_library",
1920
"//staging/src/k8s.io/apiserver/pkg/server/egressselector:go_default_library",
2021
"//staging/src/k8s.io/apiserver/pkg/util/webhook:go_default_library",

‎pkg/kubeapiserver/admission/initializer.go‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ package admission
1919
import (
2020
"k8s.io/apimachinery/pkg/api/meta"
2121
"k8s.io/apiserver/pkg/admission"
22-
quota "k8s.io/kubernetes/pkg/quota/v1"
22+
"k8s.io/apiserver/pkg/admission/initializer"
23+
quota "k8s.io/apiserver/pkg/quota/v1"
2324
)
2425

2526
// TODO add a `WantsToRun` which takes a stopCh. Might make it generic.
@@ -34,12 +35,6 @@ type WantsRESTMapper interface {
3435
SetRESTMapper(meta.RESTMapper)
3536
}
3637

37-
// WantsQuotaConfiguration defines a function which sets quota configuration for admission plugins that need it.
38-
type WantsQuotaConfiguration interface {
39-
SetQuotaConfiguration(quota.Configuration)
40-
admission.InitializationValidator
41-
}
42-
4338
// PluginInitializer is used for initialization of the Kubernetes specific admission plugins.
4439
type PluginInitializer struct {
4540
cloudConfig []byte
@@ -75,7 +70,7 @@ func (i *PluginInitializer) Initialize(plugin admission.Interface) {
7570
wants.SetRESTMapper(i.restMapper)
7671
}
7772

78-
if wants, ok := plugin.(WantsQuotaConfiguration); ok {
73+
if wants, ok := plugin.(initializer.WantsQuotaConfiguration); ok {
7974
wants.SetQuotaConfiguration(i.quotaConfiguration)
8075
}
8176
}

‎pkg/kubeapiserver/options/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ go_library(
4141
"//plugin/pkg/admission/podnodeselector:go_default_library",
4242
"//plugin/pkg/admission/podtolerationrestriction:go_default_library",
4343
"//plugin/pkg/admission/priority:go_default_library",
44-
"//plugin/pkg/admission/resourcequota:go_default_library",
4544
"//plugin/pkg/admission/runtimeclass:go_default_library",
4645
"//plugin/pkg/admission/security/podsecuritypolicy:go_default_library",
4746
"//plugin/pkg/admission/securitycontext/scdeny:go_default_library",
@@ -56,6 +55,7 @@ go_library(
5655
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
5756
"//staging/src/k8s.io/apiserver/pkg/admission:go_default_library",
5857
"//staging/src/k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle:go_default_library",
58+
"//staging/src/k8s.io/apiserver/pkg/admission/plugin/resourcequota:go_default_library",
5959
"//staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/mutating:go_default_library",
6060
"//staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/validating:go_default_library",
6161
"//staging/src/k8s.io/apiserver/pkg/authentication/authenticator:go_default_library",

0 commit comments

Comments
 (0)