From fcea91c1650b23ec07a96b5a62d08466a3771f29 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Wed, 29 May 2019 11:43:54 -0400 Subject: [PATCH] Update expected AdmissionReview MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FAIL: TestCompatibility/admission.k8s.io.v1beta1.AdmissionReview/v1.14.0 (0.02s) compatibility.go:460: json differs compatibility.go:461:   strings.Join({    ... // 31 identical lines    ` "object": {"apiVersion":"example.com/v1","kind":"CustomType","spec":{"replicas":1},"status":{"available":1}},`,    ` "oldObject": {"apiVersion":"example.com/v1","kind":"CustomType","spec":{"replicas":1},"status":{"available":1}},`, -  ` "dryRun": true`, +  ` "dryRun": true,`, +  ` "options": null`,    " },",    ` "response": {`,    ... // 33 identical lines   }, "\n") compatibility.go:466: yaml differs compatibility.go:467:   strings.Join({    ... // 23 identical lines    " available: 1",    " operation: 祈¡ıŵDz廔ȇ{sŊƏp饏姥呄鐊", +  " options: null",    " resource:",    ` group: "5"`,    ... // 38 identical lines   }, "\n") compatibility.go:472: proto differs compatibility.go:474:   strings.Join({    ... // 37 identical lines    " }",    " 11: 1", +  ` 12: ""`, +  ` 15: ""`,    " }",    " 2 {",    ... // 36 identical lines   }, "\n") Null `options` in json and additional proto tag 12 caused by https://github.com/kubernetes/kubernetes/pull/77563#discussion_r282803268 Proto tag 15 caused by https://github.com/kubernetes/kubernetes/pull/78135/files#diff-3bc4acaf71b6b50648da046287017c54R82 --- ...beta1.AdmissionReview.after_roundtrip.json | 70 ++++++++++++++++++ ...v1beta1.AdmissionReview.after_roundtrip.pb | Bin 0 -> 609 bytes ...beta1.AdmissionReview.after_roundtrip.yaml | 65 ++++++++++++++++ 3 files changed, 135 insertions(+) create mode 100644 staging/src/k8s.io/api/testdata/v1.14.0/admission.k8s.io.v1beta1.AdmissionReview.after_roundtrip.json create mode 100644 staging/src/k8s.io/api/testdata/v1.14.0/admission.k8s.io.v1beta1.AdmissionReview.after_roundtrip.pb create mode 100644 staging/src/k8s.io/api/testdata/v1.14.0/admission.k8s.io.v1beta1.AdmissionReview.after_roundtrip.yaml diff --git a/staging/src/k8s.io/api/testdata/v1.14.0/admission.k8s.io.v1beta1.AdmissionReview.after_roundtrip.json b/staging/src/k8s.io/api/testdata/v1.14.0/admission.k8s.io.v1beta1.AdmissionReview.after_roundtrip.json new file mode 100644 index 0000000000..818d3283af --- /dev/null +++ b/staging/src/k8s.io/api/testdata/v1.14.0/admission.k8s.io.v1beta1.AdmissionReview.after_roundtrip.json @@ -0,0 +1,70 @@ +{ + "kind": "AdmissionReview", + "apiVersion": "admission.k8s.io/v1beta1", + "request": { + "uid": "ő岅ȕHH壬%龺ǟ橸章蒪ʤǎ", + "kind": { + "group": "2", + "version": "3", + "kind": "4" + }, + "resource": { + "group": "5", + "version": "6", + "resource": "7" + }, + "subResource": "8", + "name": "9", + "namespace": "10", + "operation": "祈¡ıŵDz廔ȇ{sŊƏp饏姥呄鐊", + "userInfo": { + "username": "11", + "uid": "12", + "groups": [ + "13" + ], + "extra": { + "14": [ + "15" +] + } + }, + "object": {"apiVersion":"example.com/v1","kind":"CustomType","spec":{"replicas":1},"status":{"available":1}}, + "oldObject": {"apiVersion":"example.com/v1","kind":"CustomType","spec":{"replicas":1},"status":{"available":1}}, + "dryRun": true, + "options": null + }, + "response": { + "uid": "爟¼ªov鈶", + "allowed": false, + "status": { + "metadata": { + "selfLink": "(湗Ć]ʪƬ滈憴Uą飋ī", + "resourceVersion": "71208173751669476" + }, + "status": "16", + "message": "17", + "reason": "Hr鯹)晿\u003co,c鮽ort昍řČ扷5Ɨ", + "details": { + "name": "18", + "group": "19", + "kind": "20", + "uid": "Ƣ6/ʕVŚ(ĿȊ甞", + "causes": [ + { + "reason": "颋Dž", + "message": "21", + "field": "22" + } + ], + "retryAfterSeconds": 1001983654 + }, + "code": 153738858 + }, + "patch": "fQ==", + "patchType": "-Ǐ忄*齧獚敆Ȏțê", + "auditAnnotations": { + "23": "24" + } + } +} \ No newline at end of file diff --git a/staging/src/k8s.io/api/testdata/v1.14.0/admission.k8s.io.v1beta1.AdmissionReview.after_roundtrip.pb b/staging/src/k8s.io/api/testdata/v1.14.0/admission.k8s.io.v1beta1.AdmissionReview.after_roundtrip.pb new file mode 100644 index 0000000000000000000000000000000000000000..bd49825c7907019e648184957dd3e3528747a3b2 GIT binary patch literal 609 zcmd0{C}!Z&=8{NE$;~V-&dkr#%eE-i%gom=GfYY?Ni-DVcZA6VrIux;mJ6+9;kv}c zC4Y3{(@m`>rh0fhUA#v1<-T3V=RaGyp`?6YbT-N4t*o7rb2B|8)7%rxROV zPUv!y;9@c~6k;+ol43G6R^kHkOoUi~q^Va5S5mc7VnJqDY7xlQN>)m#6^Xe8IjMTd z`ME&HE9od@XXd2<#hpuwOY(C=DhpD9V#Nii$x2q$N=2y!Iho0c#Y$F&wLsC5#FA1V z8)#x#VrEWaQcfyJqBe*wwnQ){F;p=KU1a3qdEPPq(4Ir9^2=U!Y!hIRn#sszz$K~i zZ0GbNZLz0T9b5BkcgM4~EulwRUoP%GvRX*c+|bCt!qD8<+|