Skip to content

Commit 69c3ea6

Browse files
authored
Merge pull request kubernetes#3609 from Jefftree/patch-2
Update aggregated discovery types group version
2 parents e3365ff + 3f26c4f commit 69c3ea6

File tree

1 file changed

+7
-7
lines changed
  • keps/sig-api-machinery/3352-aggregated-discovery

1 file changed

+7
-7
lines changed

keps/sig-api-machinery/3352-aggregated-discovery/README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ details that didn't come across above? Go in to as much detail as
270270
necessary here. This might be a good place to talk about core concepts
271271
and how they relate. -->
272272

273-
This is an important design note around selecting the group version for the new discovery types to be `meta/v1beta1`. [Link to the full comment](https://github.com/kubernetes/kubernetes/pull/111978#discussion_r979015557)
273+
This is an important design note around selecting the group version for the new discovery types to be `apidiscovery/v2beta1`. [Link to the full comment](https://github.com/kubernetes/kubernetes/pull/111978#discussion_r979015557)
274274

275275
1. Discovery is a non-resource API class
276276
2. As a non-resource API class, once the feature gate is
@@ -325,9 +325,9 @@ aggregated discovery document.
325325

326326
Clients requesting the aggregated document will send a request with
327327
`as` (kind), `v` (version), and `g` (group) set as part of the
328-
`Accept` header. For example, a client requesting the `v1beta1`
328+
`Accept` header. For example, a client requesting the `v2beta1`
329329
version will send `Accept:
330-
application/json;as=APIGroupDiscoveryList;v=v1beta1;g=meta.k8s.io`.
330+
application/json;as=APIGroupDiscoveryList;v=v2beta1;g=apidiscovery.k8s.io`.
331331

332332
Clients should send an accept header with all the acceptable responses
333333
in preferred order. This is to avoid sending additional requests to the same endpoint if the initial preferred version is unavailable. The default accept type will not be changed and
@@ -336,9 +336,9 @@ omitting the content negotiation type will default to the unaggregated
336336
`application/vnd.kubernetes.protobuf` as a fallback option in case the
337337
server does not support the aggregated type (eg: Different version,
338338
feature disabled, etc) For instance, `Accept:
339-
application/json;as=APIGroupDiscoveryList;v=v1;g=meta.k8s.io,application/json;as=APIGroupDiscoveryList;v=v1beta1;g=meta.k8s.io,application/json`
340-
will request for the aggregated discovery v1 type, aggregated
341-
discovery v1beta1 type, and unaggregated v1 type in that order. The
339+
application/json;as=APIGroupDiscoveryList;v=v1;g=apidiscovery.k8s.io,application/json;as=APIGroupDiscoveryList;v=v2beta1;g=apidiscovery.k8s.io,application/json`
340+
will request for the aggregated discovery v2 type, aggregated
341+
discovery v2beta1 type, and unaggregated v1 type in that order. The
342342
server will return the first option that is supported.
343343

344344
### API
@@ -354,7 +354,7 @@ current API will be representable in the new API.
354354
The endpoint will also publish an ETag calculated based on a hash of
355355
the data for clients.
356356

357-
These types will live in the `meta/v1beta1` group version.
357+
These types will live in the `apidiscovery/v2beta1` group version.
358358

359359
This is what the new API will look like.
360360

0 commit comments

Comments
 (0)