Skip to content

Commit 34f0767

Browse files
yutedzyutedz
committed
Add flowcontrol to apiVersionPriorities
1 parent 0c1d714 commit 34f0767

File tree

2 files changed

+52
-37
lines changed

2 files changed

+52
-37
lines changed

‎cmd/kube-apiserver/app/aggregator.go‎

Lines changed: 38 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -251,43 +251,44 @@ var apiVersionPriorities = map[schema.GroupVersion]priority{
251251
// can reasonably expect seems questionable.
252252
{Group: "extensions", Version: "v1beta1"}: {group: 17900, version: 1},
253253
// to my knowledge, nothing below here collides
254-
{Group: "apps", Version: "v1"}: {group: 17800, version: 15},
255-
{Group: "events.k8s.io", Version: "v1beta1"}: {group: 17750, version: 5},
256-
{Group: "authentication.k8s.io", Version: "v1"}: {group: 17700, version: 15},
257-
{Group: "authentication.k8s.io", Version: "v1beta1"}: {group: 17700, version: 9},
258-
{Group: "authorization.k8s.io", Version: "v1"}: {group: 17600, version: 15},
259-
{Group: "authorization.k8s.io", Version: "v1beta1"}: {group: 17600, version: 9},
260-
{Group: "autoscaling", Version: "v1"}: {group: 17500, version: 15},
261-
{Group: "autoscaling", Version: "v2beta1"}: {group: 17500, version: 9},
262-
{Group: "autoscaling", Version: "v2beta2"}: {group: 17500, version: 1},
263-
{Group: "batch", Version: "v1"}: {group: 17400, version: 15},
264-
{Group: "batch", Version: "v1beta1"}: {group: 17400, version: 9},
265-
{Group: "batch", Version: "v2alpha1"}: {group: 17400, version: 9},
266-
{Group: "certificates.k8s.io", Version: "v1beta1"}: {group: 17300, version: 9},
267-
{Group: "networking.k8s.io", Version: "v1"}: {group: 17200, version: 15},
268-
{Group: "networking.k8s.io", Version: "v1beta1"}: {group: 17200, version: 9},
269-
{Group: "policy", Version: "v1beta1"}: {group: 17100, version: 9},
270-
{Group: "rbac.authorization.k8s.io", Version: "v1"}: {group: 17000, version: 15},
271-
{Group: "rbac.authorization.k8s.io", Version: "v1beta1"}: {group: 17000, version: 12},
272-
{Group: "rbac.authorization.k8s.io", Version: "v1alpha1"}: {group: 17000, version: 9},
273-
{Group: "settings.k8s.io", Version: "v1alpha1"}: {group: 16900, version: 9},
274-
{Group: "storage.k8s.io", Version: "v1"}: {group: 16800, version: 15},
275-
{Group: "storage.k8s.io", Version: "v1beta1"}: {group: 16800, version: 9},
276-
{Group: "storage.k8s.io", Version: "v1alpha1"}: {group: 16800, version: 1},
277-
{Group: "apiextensions.k8s.io", Version: "v1"}: {group: 16700, version: 15},
278-
{Group: "apiextensions.k8s.io", Version: "v1beta1"}: {group: 16700, version: 9},
279-
{Group: "admissionregistration.k8s.io", Version: "v1"}: {group: 16700, version: 15},
280-
{Group: "admissionregistration.k8s.io", Version: "v1beta1"}: {group: 16700, version: 12},
281-
{Group: "scheduling.k8s.io", Version: "v1"}: {group: 16600, version: 15},
282-
{Group: "scheduling.k8s.io", Version: "v1beta1"}: {group: 16600, version: 12},
283-
{Group: "scheduling.k8s.io", Version: "v1alpha1"}: {group: 16600, version: 9},
284-
{Group: "coordination.k8s.io", Version: "v1"}: {group: 16500, version: 15},
285-
{Group: "coordination.k8s.io", Version: "v1beta1"}: {group: 16500, version: 9},
286-
{Group: "auditregistration.k8s.io", Version: "v1alpha1"}: {group: 16400, version: 1},
287-
{Group: "node.k8s.io", Version: "v1alpha1"}: {group: 16300, version: 1},
288-
{Group: "node.k8s.io", Version: "v1beta1"}: {group: 16300, version: 9},
289-
{Group: "discovery.k8s.io", Version: "v1beta1"}: {group: 16200, version: 12},
290-
{Group: "discovery.k8s.io", Version: "v1alpha1"}: {group: 16200, version: 9},
254+
{Group: "apps", Version: "v1"}: {group: 17800, version: 15},
255+
{Group: "events.k8s.io", Version: "v1beta1"}: {group: 17750, version: 5},
256+
{Group: "authentication.k8s.io", Version: "v1"}: {group: 17700, version: 15},
257+
{Group: "authentication.k8s.io", Version: "v1beta1"}: {group: 17700, version: 9},
258+
{Group: "authorization.k8s.io", Version: "v1"}: {group: 17600, version: 15},
259+
{Group: "authorization.k8s.io", Version: "v1beta1"}: {group: 17600, version: 9},
260+
{Group: "autoscaling", Version: "v1"}: {group: 17500, version: 15},
261+
{Group: "autoscaling", Version: "v2beta1"}: {group: 17500, version: 9},
262+
{Group: "autoscaling", Version: "v2beta2"}: {group: 17500, version: 1},
263+
{Group: "batch", Version: "v1"}: {group: 17400, version: 15},
264+
{Group: "batch", Version: "v1beta1"}: {group: 17400, version: 9},
265+
{Group: "batch", Version: "v2alpha1"}: {group: 17400, version: 9},
266+
{Group: "certificates.k8s.io", Version: "v1beta1"}: {group: 17300, version: 9},
267+
{Group: "networking.k8s.io", Version: "v1"}: {group: 17200, version: 15},
268+
{Group: "networking.k8s.io", Version: "v1beta1"}: {group: 17200, version: 9},
269+
{Group: "policy", Version: "v1beta1"}: {group: 17100, version: 9},
270+
{Group: "rbac.authorization.k8s.io", Version: "v1"}: {group: 17000, version: 15},
271+
{Group: "rbac.authorization.k8s.io", Version: "v1beta1"}: {group: 17000, version: 12},
272+
{Group: "rbac.authorization.k8s.io", Version: "v1alpha1"}: {group: 17000, version: 9},
273+
{Group: "settings.k8s.io", Version: "v1alpha1"}: {group: 16900, version: 9},
274+
{Group: "storage.k8s.io", Version: "v1"}: {group: 16800, version: 15},
275+
{Group: "storage.k8s.io", Version: "v1beta1"}: {group: 16800, version: 9},
276+
{Group: "storage.k8s.io", Version: "v1alpha1"}: {group: 16800, version: 1},
277+
{Group: "apiextensions.k8s.io", Version: "v1"}: {group: 16700, version: 15},
278+
{Group: "apiextensions.k8s.io", Version: "v1beta1"}: {group: 16700, version: 9},
279+
{Group: "admissionregistration.k8s.io", Version: "v1"}: {group: 16700, version: 15},
280+
{Group: "admissionregistration.k8s.io", Version: "v1beta1"}: {group: 16700, version: 12},
281+
{Group: "scheduling.k8s.io", Version: "v1"}: {group: 16600, version: 15},
282+
{Group: "scheduling.k8s.io", Version: "v1beta1"}: {group: 16600, version: 12},
283+
{Group: "scheduling.k8s.io", Version: "v1alpha1"}: {group: 16600, version: 9},
284+
{Group: "coordination.k8s.io", Version: "v1"}: {group: 16500, version: 15},
285+
{Group: "coordination.k8s.io", Version: "v1beta1"}: {group: 16500, version: 9},
286+
{Group: "auditregistration.k8s.io", Version: "v1alpha1"}: {group: 16400, version: 1},
287+
{Group: "node.k8s.io", Version: "v1alpha1"}: {group: 16300, version: 1},
288+
{Group: "node.k8s.io", Version: "v1beta1"}: {group: 16300, version: 9},
289+
{Group: "discovery.k8s.io", Version: "v1beta1"}: {group: 16200, version: 12},
290+
{Group: "discovery.k8s.io", Version: "v1alpha1"}: {group: 16200, version: 9},
291+
{Group: "flowcontrol.apiserver.k8s.io", Version: "v1alpha1"}: {group: 16100, version: 9},
291292
// Append a new group to the end of the list if unsure.
292293
// You can use min(existing group)-100 as the initial value for a group.
293294
// Version can be set to 9 (to have space around) for a new group.

‎test/integration/etcd/data.go‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,20 @@ func GetEtcdStorageDataForNamespace(namespace string) map[schema.GroupVersionRes
247247
},
248248
// --
249249

250+
// k8s.io/kubernetes/pkg/apis/flowcontrol/v1alpha1
251+
gvr("flowcontrol.apiserver.k8s.io", "v1alpha1", "flowschemas"): {
252+
Stub: `{"metadata": {"name": "va1"}, "spec": {"priorityLevelConfiguration": {"name": "name1"}}}`,
253+
ExpectedEtcdPath: "/registry/flowschemas/va1",
254+
},
255+
// --
256+
257+
// k8s.io/kubernetes/pkg/apis/flowcontrol/v1alpha1
258+
gvr("flowcontrol.apiserver.k8s.io", "v1alpha1", "prioritylevelconfigurations"): {
259+
Stub: `{"metadata": {"name": "conf1"}, "spec": {"type": "Limited", "limited": {"assuredConcurrencyShares":3, "limitResponse": {"type": "Reject"}}}}`,
260+
ExpectedEtcdPath: "/registry/prioritylevelconfigurations/conf1",
261+
},
262+
// --
263+
250264
// k8s.io/kubernetes/pkg/apis/storage/v1beta1
251265
gvr("storage.k8s.io", "v1beta1", "volumeattachments"): {
252266
Stub: `{"metadata": {"name": "va2"}, "spec": {"attacher": "gce", "nodeName": "localhost", "source": {"persistentVolumeName": "pv2"}}}`,

0 commit comments

Comments
 (0)