From 9328351de4e78c330411964d9cb1390f1b2296b3 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Thu, 15 Sep 2022 17:08:40 -0400 Subject: [PATCH] Add compatibility fixtures for v1beta2 flowcontrol --- staging/src/k8s.io/api/roundtrip_test.go | 2 + ...l.apiserver.k8s.io.v1beta2.FlowSchema.json | 112 ++++++++++++++++++ ...rol.apiserver.k8s.io.v1beta2.FlowSchema.pb | Bin 0 -> 686 bytes ...l.apiserver.k8s.io.v1beta2.FlowSchema.yaml | 72 +++++++++++ ...io.v1beta2.PriorityLevelConfiguration.json | 71 +++++++++++ ...s.io.v1beta2.PriorityLevelConfiguration.pb | Bin 0 -> 537 bytes ...io.v1beta2.PriorityLevelConfiguration.yaml | 51 ++++++++ ...l.apiserver.k8s.io.v1beta2.FlowSchema.json | 112 ++++++++++++++++++ ...rol.apiserver.k8s.io.v1beta2.FlowSchema.pb | Bin 0 -> 686 bytes ...l.apiserver.k8s.io.v1beta2.FlowSchema.yaml | 72 +++++++++++ ...io.v1beta2.PriorityLevelConfiguration.json | 71 +++++++++++ ...s.io.v1beta2.PriorityLevelConfiguration.pb | Bin 0 -> 537 bytes ...io.v1beta2.PriorityLevelConfiguration.yaml | 51 ++++++++ ...l.apiserver.k8s.io.v1beta2.FlowSchema.json | 112 ++++++++++++++++++ ...rol.apiserver.k8s.io.v1beta2.FlowSchema.pb | Bin 0 -> 686 bytes ...l.apiserver.k8s.io.v1beta2.FlowSchema.yaml | 72 +++++++++++ ...io.v1beta2.PriorityLevelConfiguration.json | 71 +++++++++++ ...s.io.v1beta2.PriorityLevelConfiguration.pb | Bin 0 -> 537 bytes ...io.v1beta2.PriorityLevelConfiguration.yaml | 51 ++++++++ 19 files changed, 920 insertions(+) create mode 100644 staging/src/k8s.io/api/testdata/HEAD/flowcontrol.apiserver.k8s.io.v1beta2.FlowSchema.json create mode 100644 staging/src/k8s.io/api/testdata/HEAD/flowcontrol.apiserver.k8s.io.v1beta2.FlowSchema.pb create mode 100644 staging/src/k8s.io/api/testdata/HEAD/flowcontrol.apiserver.k8s.io.v1beta2.FlowSchema.yaml create mode 100644 staging/src/k8s.io/api/testdata/HEAD/flowcontrol.apiserver.k8s.io.v1beta2.PriorityLevelConfiguration.json create mode 100644 staging/src/k8s.io/api/testdata/HEAD/flowcontrol.apiserver.k8s.io.v1beta2.PriorityLevelConfiguration.pb create mode 100644 staging/src/k8s.io/api/testdata/HEAD/flowcontrol.apiserver.k8s.io.v1beta2.PriorityLevelConfiguration.yaml create mode 100644 staging/src/k8s.io/api/testdata/v1.24.0/flowcontrol.apiserver.k8s.io.v1beta2.FlowSchema.json create mode 100644 staging/src/k8s.io/api/testdata/v1.24.0/flowcontrol.apiserver.k8s.io.v1beta2.FlowSchema.pb create mode 100644 staging/src/k8s.io/api/testdata/v1.24.0/flowcontrol.apiserver.k8s.io.v1beta2.FlowSchema.yaml create mode 100644 staging/src/k8s.io/api/testdata/v1.24.0/flowcontrol.apiserver.k8s.io.v1beta2.PriorityLevelConfiguration.json create mode 100644 staging/src/k8s.io/api/testdata/v1.24.0/flowcontrol.apiserver.k8s.io.v1beta2.PriorityLevelConfiguration.pb create mode 100644 staging/src/k8s.io/api/testdata/v1.24.0/flowcontrol.apiserver.k8s.io.v1beta2.PriorityLevelConfiguration.yaml create mode 100644 staging/src/k8s.io/api/testdata/v1.25.0/flowcontrol.apiserver.k8s.io.v1beta2.FlowSchema.json create mode 100644 staging/src/k8s.io/api/testdata/v1.25.0/flowcontrol.apiserver.k8s.io.v1beta2.FlowSchema.pb create mode 100644 staging/src/k8s.io/api/testdata/v1.25.0/flowcontrol.apiserver.k8s.io.v1beta2.FlowSchema.yaml create mode 100644 staging/src/k8s.io/api/testdata/v1.25.0/flowcontrol.apiserver.k8s.io.v1beta2.PriorityLevelConfiguration.json create mode 100644 staging/src/k8s.io/api/testdata/v1.25.0/flowcontrol.apiserver.k8s.io.v1beta2.PriorityLevelConfiguration.pb create mode 100644 staging/src/k8s.io/api/testdata/v1.25.0/flowcontrol.apiserver.k8s.io.v1beta2.PriorityLevelConfiguration.yaml diff --git a/staging/src/k8s.io/api/roundtrip_test.go b/staging/src/k8s.io/api/roundtrip_test.go index 6cdf8fcf243..22822b7b663 100644 --- a/staging/src/k8s.io/api/roundtrip_test.go +++ b/staging/src/k8s.io/api/roundtrip_test.go @@ -50,6 +50,7 @@ import ( extensionsv1beta1 "k8s.io/api/extensions/v1beta1" flowcontrolv1alpha1 "k8s.io/api/flowcontrol/v1alpha1" flowcontrolv1beta1 "k8s.io/api/flowcontrol/v1beta1" + flowcontrolv1beta2 "k8s.io/api/flowcontrol/v1beta2" imagepolicyv1alpha1 "k8s.io/api/imagepolicy/v1alpha1" networkingv1 "k8s.io/api/networking/v1" networkingv1alpha1 "k8s.io/api/networking/v1alpha1" @@ -108,6 +109,7 @@ var groups = []runtime.SchemeBuilder{ extensionsv1beta1.SchemeBuilder, flowcontrolv1alpha1.SchemeBuilder, flowcontrolv1beta1.SchemeBuilder, + flowcontrolv1beta2.SchemeBuilder, imagepolicyv1alpha1.SchemeBuilder, networkingv1.SchemeBuilder, networkingv1beta1.SchemeBuilder, diff --git a/staging/src/k8s.io/api/testdata/HEAD/flowcontrol.apiserver.k8s.io.v1beta2.FlowSchema.json b/staging/src/k8s.io/api/testdata/HEAD/flowcontrol.apiserver.k8s.io.v1beta2.FlowSchema.json new file mode 100644 index 00000000000..9270c206105 --- /dev/null +++ b/staging/src/k8s.io/api/testdata/HEAD/flowcontrol.apiserver.k8s.io.v1beta2.FlowSchema.json @@ -0,0 +1,112 @@ +{ + "kind": "FlowSchema", + "apiVersion": "flowcontrol.apiserver.k8s.io/v1beta2", + "metadata": { + "name": "nameValue", + "generateName": "generateNameValue", + "namespace": "namespaceValue", + "selfLink": "selfLinkValue", + "uid": "uidValue", + "resourceVersion": "resourceVersionValue", + "generation": 7, + "creationTimestamp": "2008-01-01T01:01:01Z", + "deletionTimestamp": "2009-01-01T01:01:01Z", + "deletionGracePeriodSeconds": 10, + "labels": { + "labelsKey": "labelsValue" + }, + "annotations": { + "annotationsKey": "annotationsValue" + }, + "ownerReferences": [ + { + "apiVersion": "apiVersionValue", + "kind": "kindValue", + "name": "nameValue", + "uid": "uidValue", + "controller": true, + "blockOwnerDeletion": true + } + ], + "finalizers": [ + "finalizersValue" + ], + "managedFields": [ + { + "manager": "managerValue", + "operation": "operationValue", + "apiVersion": "apiVersionValue", + "time": "2004-01-01T01:01:01Z", + "fieldsType": "fieldsTypeValue", + "fieldsV1": {}, + "subresource": "subresourceValue" + } + ] + }, + "spec": { + "priorityLevelConfiguration": { + "name": "nameValue" + }, + "matchingPrecedence": 2, + "distinguisherMethod": { + "type": "typeValue" + }, + "rules": [ + { + "subjects": [ + { + "kind": "kindValue", + "user": { + "name": "nameValue" + }, + "group": { + "name": "nameValue" + }, + "serviceAccount": { + "namespace": "namespaceValue", + "name": "nameValue" + } + } + ], + "resourceRules": [ + { + "verbs": [ + "verbsValue" + ], + "apiGroups": [ + "apiGroupsValue" + ], + "resources": [ + "resourcesValue" + ], + "clusterScope": true, + "namespaces": [ + "namespacesValue" + ] + } + ], + "nonResourceRules": [ + { + "verbs": [ + "verbsValue" + ], + "nonResourceURLs": [ + "nonResourceURLsValue" + ] + } + ] + } + ] + }, + "status": { + "conditions": [ + { + "type": "typeValue", + "status": "statusValue", + "lastTransitionTime": "2003-01-01T01:01:01Z", + "reason": "reasonValue", + "message": "messageValue" + } + ] + } +} \ No newline at end of file diff --git a/staging/src/k8s.io/api/testdata/HEAD/flowcontrol.apiserver.k8s.io.v1beta2.FlowSchema.pb b/staging/src/k8s.io/api/testdata/HEAD/flowcontrol.apiserver.k8s.io.v1beta2.FlowSchema.pb new file mode 100644 index 0000000000000000000000000000000000000000..e62f711aebf5d7507fb3a1bb1ff2bd29737e404a GIT binary patch literal 686 zcmZ8f%}(1u5Vk|4CKGVXiUTqiwBnRQ082;_5<<#>N-e4o&>pz0!-SeRyVkA^0>lgO z796WSLSFz?;vK3UdM$SjFj+gn;x<3u%zpEIJL(w+LRcFn>T;lDrd84vX>3qmpze-( zrW>pEi_Hi#5i-~#)Y0HOjs^Q)hd(uFN-@T7BFT|0o}ol7GW;?v1>U4hnRPIMZ1d}^a`NuyD@CLC%LD`~5}5B)~t@&4bhy6=3V=;zaKiVomp8JdZRFfpI; zinWT+PDC6$A*IShMoVnlujCeUz6H%uEQ^POH~xIarqdg)-Z9sNLN5eUnEsC9J3q zF0?8l`?Y}5Y&yn&xX`bh!>ZT`a^?6vkU1+71Y{nn=2ASg}AQF(D?#1b0dd3**Aw6kf^LVWydBF=)Jiw{Yzd zynrF$4#tIR_AYdo3O4TEeDB}yeG_%0fx4&>Qhqn!ED@Zxa7-kK35ZtIkuAdaCx-zf zxb1p&fHlMy%&(p@EEQ!O~KtB0RxqU%a!C+msuI(K~~~# zNuXhmut;|_t&|LP)ZP^!c`8&L2&txPwX@l^toifjYsoRrRrIo$si==`>d2-z04gtF z>Xx%mcLYAFV#au)5p~+hy>-p)5wat~vc=vXzrUtw)|4T6kOQ-0idsk*rsQ4$>N!tl zfGT6m@Cbw!+$xWk_pk81|6_c0!^ix)=ooD^4Cqi^P2N-e4o&>pz0!-SeRyVkA^0>lgO z796WSLSFz?;vK3UdM$SjFj+gn;x<3u%zpEIJL(w+LRcFn>T;lDrd84vX>3qmpze-( zrW>pEi_Hi#5i-~#)Y0HOjs^Q)hd(uFN-@T7BFT|0o}ol7GW;?v1>U4hnRPIMZ1d}^a`NuyD@CLC%LD`~5}5B)~t@&4bhy6=3V=;zaKiVomp8JdZRFfpI; zinWT+PDC6$A*IShMoVnlujCeUz6H%uEQ^POH~xIarqdg)-Z9sNLN5eUnEsC9J3q zF0?8l`?Y}5Y&yn&xX`bh!>ZT`a^?6vkU1+71Y{nn=2ASg}AQF(D?#1b0dd3**Aw6kf^LVWydBF=)Jiw{Yzd zynrF$4#tIR_AYdo3O4TEeDB}yeG_%0fx4&>Qhqn!ED@Zxa7-kK35ZtIkuAdaCx-zf zxb1p&fHlMy%&(p@EEQ!O~KtB0RxqU%a!C+msuI(K~~~# zNuXhmut;|_t&|LP)ZP^!c`8&L2&txPwX@l^toifjYsoRrRrIo$si==`>d2-z04gtF z>Xx%mcLYAFV#au)5p~+hy>-p)5wat~vc=vXzrUtw)|4T6kOQ-0idsk*rsQ4$>N!tl zfGT6m@Cbw!+$xWk_pk81|6_c0!^ix)=ooD^4Cqi^P2N-e4o&>pz0!-SeRyVkA^0>lgO z796WSLSFz?;vK3UdM$SjFj+gn;x<3u%zpEIJL(w+LRcFn>T;lDrd84vX>3qmpze-( zrW>pEi_Hi#5i-~#)Y0HOjs^Q)hd(uFN-@T7BFT|0o}ol7GW;?v1>U4hnRPIMZ1d}^a`NuyD@CLC%LD`~5}5B)~t@&4bhy6=3V=;zaKiVomp8JdZRFfpI; zinWT+PDC6$A*IShMoVnlujCeUz6H%uEQ^POH~xIarqdg)-Z9sNLN5eUnEsC9J3q zF0?8l`?Y}5Y&yn&xX`bh!>ZT`a^?6vkU1+71Y{nn=2ASg}AQF(D?#1b0dd3**Aw6kf^LVWydBF=)Jiw{Yzd zynrF$4#tIR_AYdo3O4TEeDB}yeG_%0fx4&>Qhqn!ED@Zxa7-kK35ZtIkuAdaCx-zf zxb1p&fHlMy%&(p@EEQ!O~KtB0RxqU%a!C+msuI(K~~~# zNuXhmut;|_t&|LP)ZP^!c`8&L2&txPwX@l^toifjYsoRrRrIo$si==`>d2-z04gtF z>Xx%mcLYAFV#au)5p~+hy>-p)5wat~vc=vXzrUtw)|4T6kOQ-0idsk*rsQ4$>N!tl zfGT6m@Cbw!+$xWk_pk81|6_c0!^ix)=ooD^4Cqi^P2