Skip to content

Commit 3bf9477

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#122472 from pacoxu/flowcontrolv1
flowcontrol: set the serialization version to v1
2 parents 015e76a + f73bba5 commit 3bf9477

File tree

5 files changed

+15
-18
lines changed

5 files changed

+15
-18
lines changed

‎api/discovery/apis__flowcontrol.apiserver.k8s.io__v1.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"name": "flowschemas",
99
"namespaced": false,
1010
"singularName": "flowschema",
11-
"storageVersionHash": "9NnFrw7ZEmA=",
11+
"storageVersionHash": "GJVAJZSZBIw=",
1212
"verbs": [
1313
"create",
1414
"delete",
@@ -36,7 +36,7 @@
3636
"name": "prioritylevelconfigurations",
3737
"namespaced": false,
3838
"singularName": "prioritylevelconfiguration",
39-
"storageVersionHash": "+CwSrEWTDhc=",
39+
"storageVersionHash": "Kir5PVfvNeI=",
4040
"verbs": [
4141
"create",
4242
"delete",

‎api/discovery/apis__flowcontrol.apiserver.k8s.io__v1beta3.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"name": "flowschemas",
99
"namespaced": false,
1010
"singularName": "flowschema",
11-
"storageVersionHash": "9NnFrw7ZEmA=",
11+
"storageVersionHash": "GJVAJZSZBIw=",
1212
"verbs": [
1313
"create",
1414
"delete",
@@ -36,7 +36,7 @@
3636
"name": "prioritylevelconfigurations",
3737
"namespaced": false,
3838
"singularName": "prioritylevelconfiguration",
39-
"storageVersionHash": "+CwSrEWTDhc=",
39+
"storageVersionHash": "Kir5PVfvNeI=",
4040
"verbs": [
4141
"create",
4242
"delete",

‎pkg/apis/flowcontrol/install/install.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ func Install(scheme *runtime.Scheme) {
4141
utilruntime.Must(flowcontrolv1beta3.AddToScheme(scheme))
4242
utilruntime.Must(flowcontrolv1.AddToScheme(scheme))
4343

44-
// TODO(#121119): This controls serialization order, for 1.29, we continue
45-
// to use v1beta3 as the serialization version because vN-1 understands that
46-
// level. In 1.30, we should set the serialization version to v1.
47-
utilruntime.Must(scheme.SetVersionPriority(flowcontrolv1beta3.SchemeGroupVersion, flowcontrolv1.SchemeGroupVersion,
44+
utilruntime.Must(scheme.SetVersionPriority(flowcontrolv1.SchemeGroupVersion, flowcontrolv1beta3.SchemeGroupVersion,
4845
flowcontrolv1beta2.SchemeGroupVersion, flowcontrolv1beta1.SchemeGroupVersion))
4946
}

‎pkg/controlplane/storageversionhashdata/data.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ var GVRToStorageVersionHash = map[string]string{
8282
"admissionregistration.k8s.io/v1/mutatingwebhookconfigurations": "Sqi0GUgDaX0=",
8383
"admissionregistration.k8s.io/v1/validatingwebhookconfigurations": "B0wHjQmsGNk=",
8484
"events.k8s.io/v1/events": "r2yiGXH7wu8=",
85-
"flowcontrol.apiserver.k8s.io/v1beta3/flowschemas": "9NnFrw7ZEmA=",
86-
"flowcontrol.apiserver.k8s.io/v1beta3/prioritylevelconfigurations": "+CwSrEWTDhc=",
87-
"flowcontrol.apiserver.k8s.io/v1/flowschemas": "9NnFrw7ZEmA=",
88-
"flowcontrol.apiserver.k8s.io/v1/prioritylevelconfigurations": "+CwSrEWTDhc=",
85+
"flowcontrol.apiserver.k8s.io/v1beta3/flowschemas": "GJVAJZSZBIw=",
86+
"flowcontrol.apiserver.k8s.io/v1beta3/prioritylevelconfigurations": "Kir5PVfvNeI=",
87+
"flowcontrol.apiserver.k8s.io/v1/flowschemas": "GJVAJZSZBIw=",
88+
"flowcontrol.apiserver.k8s.io/v1/prioritylevelconfigurations": "Kir5PVfvNeI=",
8989
}

‎test/integration/etcd/data.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -228,61 +228,61 @@ func GetEtcdStorageDataForNamespace(namespace string) map[schema.GroupVersionRes
228228
gvr("flowcontrol.apiserver.k8s.io", "v1beta1", "flowschemas"): {
229229
Stub: `{"metadata": {"name": "va2"}, "spec": {"priorityLevelConfiguration": {"name": "name1"}}}`,
230230
ExpectedEtcdPath: "/registry/flowschemas/va2",
231-
ExpectedGVK: gvkP("flowcontrol.apiserver.k8s.io", "v1beta3", "FlowSchema"),
231+
ExpectedGVK: gvkP("flowcontrol.apiserver.k8s.io", "v1", "FlowSchema"),
232232
},
233233
// --
234234

235235
// k8s.io/kubernetes/pkg/apis/flowcontrol/v1beta1
236236
gvr("flowcontrol.apiserver.k8s.io", "v1beta1", "prioritylevelconfigurations"): {
237237
Stub: `{"metadata": {"name": "conf2"}, "spec": {"type": "Limited", "limited": {"assuredConcurrencyShares":3, "limitResponse": {"type": "Reject"}}}}`,
238238
ExpectedEtcdPath: "/registry/prioritylevelconfigurations/conf2",
239-
ExpectedGVK: gvkP("flowcontrol.apiserver.k8s.io", "v1beta3", "PriorityLevelConfiguration"),
239+
ExpectedGVK: gvkP("flowcontrol.apiserver.k8s.io", "v1", "PriorityLevelConfiguration"),
240240
},
241241
// --
242242

243243
// k8s.io/kubernetes/pkg/apis/flowcontrol/v1beta2
244244
gvr("flowcontrol.apiserver.k8s.io", "v1beta2", "flowschemas"): {
245245
Stub: `{"metadata": {"name": "fs-1"}, "spec": {"priorityLevelConfiguration": {"name": "name1"}}}`,
246246
ExpectedEtcdPath: "/registry/flowschemas/fs-1",
247-
ExpectedGVK: gvkP("flowcontrol.apiserver.k8s.io", "v1beta3", "FlowSchema"),
247+
ExpectedGVK: gvkP("flowcontrol.apiserver.k8s.io", "v1", "FlowSchema"),
248248
},
249249
// --
250250

251251
// k8s.io/kubernetes/pkg/apis/flowcontrol/v1beta2
252252
gvr("flowcontrol.apiserver.k8s.io", "v1beta2", "prioritylevelconfigurations"): {
253253
Stub: `{"metadata": {"name": "conf3"}, "spec": {"type": "Limited", "limited": {"assuredConcurrencyShares":3, "limitResponse": {"type": "Reject"}}}}`,
254254
ExpectedEtcdPath: "/registry/prioritylevelconfigurations/conf3",
255-
ExpectedGVK: gvkP("flowcontrol.apiserver.k8s.io", "v1beta3", "PriorityLevelConfiguration"),
255+
ExpectedGVK: gvkP("flowcontrol.apiserver.k8s.io", "v1", "PriorityLevelConfiguration"),
256256
},
257257
// --
258258

259259
// k8s.io/kubernetes/pkg/apis/flowcontrol/v1beta3
260260
gvr("flowcontrol.apiserver.k8s.io", "v1beta3", "flowschemas"): {
261261
Stub: `{"metadata": {"name": "fs-2"}, "spec": {"priorityLevelConfiguration": {"name": "name1"}}}`,
262262
ExpectedEtcdPath: "/registry/flowschemas/fs-2",
263+
ExpectedGVK: gvkP("flowcontrol.apiserver.k8s.io", "v1", "FlowSchema"),
263264
},
264265
// --
265266

266267
// k8s.io/kubernetes/pkg/apis/flowcontrol/v1beta3
267268
gvr("flowcontrol.apiserver.k8s.io", "v1beta3", "prioritylevelconfigurations"): {
268269
Stub: `{"metadata": {"name": "conf4"}, "spec": {"type": "Limited", "limited": {"nominalConcurrencyShares":3, "limitResponse": {"type": "Reject"}}}}`,
269270
ExpectedEtcdPath: "/registry/prioritylevelconfigurations/conf4",
271+
ExpectedGVK: gvkP("flowcontrol.apiserver.k8s.io", "v1", "PriorityLevelConfiguration"),
270272
},
271273
// --
272274

273275
// k8s.io/kubernetes/pkg/apis/flowcontrol/v1
274276
gvr("flowcontrol.apiserver.k8s.io", "v1", "flowschemas"): {
275277
Stub: `{"metadata": {"name": "fs-3"}, "spec": {"priorityLevelConfiguration": {"name": "name1"}}}`,
276278
ExpectedEtcdPath: "/registry/flowschemas/fs-3",
277-
ExpectedGVK: gvkP("flowcontrol.apiserver.k8s.io", "v1beta3", "FlowSchema"),
278279
},
279280
// --
280281

281282
// k8s.io/kubernetes/pkg/apis/flowcontrol/v1
282283
gvr("flowcontrol.apiserver.k8s.io", "v1", "prioritylevelconfigurations"): {
283284
Stub: `{"metadata": {"name": "conf5"}, "spec": {"type": "Limited", "limited": {"nominalConcurrencyShares":3, "limitResponse": {"type": "Reject"}}}}`,
284285
ExpectedEtcdPath: "/registry/prioritylevelconfigurations/conf5",
285-
ExpectedGVK: gvkP("flowcontrol.apiserver.k8s.io", "v1beta3", "PriorityLevelConfiguration"),
286286
},
287287
// --
288288

0 commit comments

Comments
 (0)