Skip to content

Commit 7c861ef

Browse files
committed
Fix test expectations with new API discovery requests
1 parent b14a954 commit 7c861ef

File tree

5 files changed

+594
-33
lines changed

5 files changed

+594
-33
lines changed

mockkubeapiserver/tests/testdata/configmap/expected.yaml

+276
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
GET http://kube-apiserver/api
2+
Accept: application/json;g=apidiscovery.k8s.io;v=v2;as=APIGroupDiscoveryList,application/json;g=apidiscovery.k8s.io;v=v2beta1;as=APIGroupDiscoveryList,application/json
3+
4+
5+
200 OK
6+
Cache-Control: no-cache, private
7+
Content-Length: 74
8+
Content-Type: application/json
9+
Date: (removed)
10+
11+
{
12+
"kind": "APIVersions",
13+
"serverAddressByClientCIDRs": null,
14+
"versions": [
15+
"v1"
16+
]
17+
}
18+
19+
---
20+
121
GET http://kube-apiserver/api/v1
222
Accept: application/json, */*
323

@@ -146,6 +166,262 @@ Date: (removed)
146166

147167
---
148168

169+
GET http://kube-apiserver/apis
170+
Accept: application/json;g=apidiscovery.k8s.io;v=v2;as=APIGroupDiscoveryList,application/json;g=apidiscovery.k8s.io;v=v2beta1;as=APIGroupDiscoveryList,application/json
171+
172+
173+
200 OK
174+
Cache-Control: no-cache, private
175+
Content-Length: 3203
176+
Content-Type: application/json
177+
Date: (removed)
178+
179+
{
180+
"apiVersion": "v1",
181+
"groups": [
182+
{
183+
"name": "admissionregistration.k8s.io",
184+
"preferredVersion": {
185+
"groupVersion": "admissionregistration.k8s.io/v1",
186+
"version": "v1"
187+
},
188+
"versions": [
189+
{
190+
"groupVersion": "admissionregistration.k8s.io/v1",
191+
"version": "v1"
192+
}
193+
]
194+
},
195+
{
196+
"name": "apiextensions.k8s.io",
197+
"preferredVersion": {
198+
"groupVersion": "apiextensions.k8s.io/v1",
199+
"version": "v1"
200+
},
201+
"versions": [
202+
{
203+
"groupVersion": "apiextensions.k8s.io/v1",
204+
"version": "v1"
205+
}
206+
]
207+
},
208+
{
209+
"name": "apiregistration.k8s.io",
210+
"preferredVersion": {
211+
"groupVersion": "apiregistration.k8s.io/v1",
212+
"version": "v1"
213+
},
214+
"versions": [
215+
{
216+
"groupVersion": "apiregistration.k8s.io/v1",
217+
"version": "v1"
218+
}
219+
]
220+
},
221+
{
222+
"name": "apps",
223+
"preferredVersion": {
224+
"groupVersion": "apps/v1",
225+
"version": "v1"
226+
},
227+
"versions": [
228+
{
229+
"groupVersion": "apps/v1",
230+
"version": "v1"
231+
}
232+
]
233+
},
234+
{
235+
"name": "autoscaling",
236+
"preferredVersion": {
237+
"groupVersion": "autoscaling/v2beta2",
238+
"version": "v2beta2"
239+
},
240+
"versions": [
241+
{
242+
"groupVersion": "autoscaling/v1",
243+
"version": "v1"
244+
},
245+
{
246+
"groupVersion": "autoscaling/v2",
247+
"version": "v2"
248+
},
249+
{
250+
"groupVersion": "autoscaling/v2beta2",
251+
"version": "v2beta2"
252+
}
253+
]
254+
},
255+
{
256+
"name": "batch",
257+
"preferredVersion": {
258+
"groupVersion": "batch/v1",
259+
"version": "v1"
260+
},
261+
"versions": [
262+
{
263+
"groupVersion": "batch/v1",
264+
"version": "v1"
265+
}
266+
]
267+
},
268+
{
269+
"name": "certificates.k8s.io",
270+
"preferredVersion": {
271+
"groupVersion": "certificates.k8s.io/v1",
272+
"version": "v1"
273+
},
274+
"versions": [
275+
{
276+
"groupVersion": "certificates.k8s.io/v1",
277+
"version": "v1"
278+
}
279+
]
280+
},
281+
{
282+
"name": "coordination.k8s.io",
283+
"preferredVersion": {
284+
"groupVersion": "coordination.k8s.io/v1",
285+
"version": "v1"
286+
},
287+
"versions": [
288+
{
289+
"groupVersion": "coordination.k8s.io/v1",
290+
"version": "v1"
291+
}
292+
]
293+
},
294+
{
295+
"name": "discovery.k8s.io",
296+
"preferredVersion": {
297+
"groupVersion": "discovery.k8s.io/v1",
298+
"version": "v1"
299+
},
300+
"versions": [
301+
{
302+
"groupVersion": "discovery.k8s.io/v1",
303+
"version": "v1"
304+
}
305+
]
306+
},
307+
{
308+
"name": "events.k8s.io",
309+
"preferredVersion": {
310+
"groupVersion": "events.k8s.io/v1",
311+
"version": "v1"
312+
},
313+
"versions": [
314+
{
315+
"groupVersion": "events.k8s.io/v1",
316+
"version": "v1"
317+
}
318+
]
319+
},
320+
{
321+
"name": "flowcontrol.apiserver.k8s.io",
322+
"preferredVersion": {
323+
"groupVersion": "flowcontrol.apiserver.k8s.io/v1beta2",
324+
"version": "v1beta2"
325+
},
326+
"versions": [
327+
{
328+
"groupVersion": "flowcontrol.apiserver.k8s.io/v1beta1",
329+
"version": "v1beta1"
330+
},
331+
{
332+
"groupVersion": "flowcontrol.apiserver.k8s.io/v1beta2",
333+
"version": "v1beta2"
334+
}
335+
]
336+
},
337+
{
338+
"name": "networking.k8s.io",
339+
"preferredVersion": {
340+
"groupVersion": "networking.k8s.io/v1",
341+
"version": "v1"
342+
},
343+
"versions": [
344+
{
345+
"groupVersion": "networking.k8s.io/v1",
346+
"version": "v1"
347+
}
348+
]
349+
},
350+
{
351+
"name": "node.k8s.io",
352+
"preferredVersion": {
353+
"groupVersion": "node.k8s.io/v1",
354+
"version": "v1"
355+
},
356+
"versions": [
357+
{
358+
"groupVersion": "node.k8s.io/v1",
359+
"version": "v1"
360+
}
361+
]
362+
},
363+
{
364+
"name": "policy",
365+
"preferredVersion": {
366+
"groupVersion": "policy/v1",
367+
"version": "v1"
368+
},
369+
"versions": [
370+
{
371+
"groupVersion": "policy/v1",
372+
"version": "v1"
373+
}
374+
]
375+
},
376+
{
377+
"name": "rbac.authorization.k8s.io",
378+
"preferredVersion": {
379+
"groupVersion": "rbac.authorization.k8s.io/v1",
380+
"version": "v1"
381+
},
382+
"versions": [
383+
{
384+
"groupVersion": "rbac.authorization.k8s.io/v1",
385+
"version": "v1"
386+
}
387+
]
388+
},
389+
{
390+
"name": "scheduling.k8s.io",
391+
"preferredVersion": {
392+
"groupVersion": "scheduling.k8s.io/v1",
393+
"version": "v1"
394+
},
395+
"versions": [
396+
{
397+
"groupVersion": "scheduling.k8s.io/v1",
398+
"version": "v1"
399+
}
400+
]
401+
},
402+
{
403+
"name": "storage.k8s.io",
404+
"preferredVersion": {
405+
"groupVersion": "storage.k8s.io/v1beta1",
406+
"version": "v1beta1"
407+
},
408+
"versions": [
409+
{
410+
"groupVersion": "storage.k8s.io/v1",
411+
"version": "v1"
412+
},
413+
{
414+
"groupVersion": "storage.k8s.io/v1beta1",
415+
"version": "v1beta1"
416+
}
417+
]
418+
}
419+
],
420+
"kind": "APIGroupList"
421+
}
422+
423+
---
424+
149425
PATCH http://kube-apiserver/api/v1/namespaces/default?fieldManager=test&force=false
150426
Accept: application/json
151427
Content-Type: application/apply-patch+yaml

0 commit comments

Comments
 (0)