Merge pull request #45267 from Jefftree/docs-agg-disco

[KEP-3352] docs for aggregated discovery

Author: k8s-ci-robot

content/en/docs/concepts/overview/kubernetes-api.md

@@ -71,22 +71,22 @@ separate endpoint for each group version.
 
 ### Aggregated discovery
 
-{{< feature-state state="beta" for_k8s_version="v1.27" >}}
+{{< feature-state feature_gate_name="AggregatedDiscoveryEndpoint" >}}
 
-Kubernetes offers beta support for aggregated discovery, publishing
+Kubernetes offers stable support for _aggregated discovery_, publishing
 all resources supported by a cluster through two endpoints (`/api` and
 `/apis`). Requesting this
 endpoint drastically reduces the number of requests sent to fetch the
 discovery data from the cluster. You can access the data by
 requesting the respective endpoints with an `Accept` header indicating
 the aggregated discovery resource:
-`Accept: application/json;v=v2beta1;g=apidiscovery.k8s.io;as=APIGroupDiscoveryList`.
+`Accept: application/json;v=v2;g=apidiscovery.k8s.io;as=APIGroupDiscoveryList`.
 
 Without indicating the resource type using the `Accept` header, the default
 response for the `/api` and `/apis` endpoint is an unaggregated discovery
 document.
 
-The [discovery document](https://github.com/kubernetes/kubernetes/blob/release-v{{< skew currentVersion >}}/api/discovery/aggregated_v2beta1.json)
+The [discovery document](https://github.com/kubernetes/kubernetes/blob/release-v{{< skew currentVersion >}}/api/discovery/aggregated_v2.json)
 for the built-in resources can be found in the Kubernetes GitHub repository.
 This Github document can be used as a reference of the base set of the available resources
 if a Kubernetes cluster is not available to query.
@@ -282,30 +282,6 @@ packages that define the API objects.
 Kubernetes stores the serialized state of objects by writing them into
 {{< glossary_tooltip term_id="etcd" >}}.
 
-## API Discovery
-
-A list of all group versions supported by a cluster is published at
-the `/api` and `/apis` endpoints. Each group version also advertises
-the list of resources supported via `/apis/<group>/<version>` (for
-example: `/apis/rbac.authorization.k8s.io/v1alpha1`). These endpoints
-are used by kubectl to fetch the list of resources supported by a
-cluster.
-
-### Aggregated Discovery
-
-{{< feature-state feature_gate_name="AggregatedDiscoveryEndpoint" >}}
-
-Kubernetes offers beta support for aggregated discovery, publishing
-all resources supported by a cluster through two endpoints (`/api` and
-`/apis`) compared to one for every group version. Requesting this
-endpoint drastically reduces the number of requests sent to fetch the
-discovery for the average Kubernetes cluster. This may be accessed by
-requesting the respective endpoints with an Accept header indicating
-the aggregated discovery resource:
-`Accept: application/json;v=v2beta1;g=apidiscovery.k8s.io;as=APIGroupDiscoveryList`.
-
-The endpoint also supports ETag and protobuf encoding.
-
 ## API groups and versioning
 
 To make it easier to eliminate fields or restructure resource representations,

content/en/docs/reference/command-line-tools-reference/feature-gates/aggregated-discovery-endpoint.md

@@ -13,6 +13,10 @@ stages:
   - stage: beta
     defaultValue: true
     fromVersion: "1.27"
+    toVersion: "1.29"
+  - stage: stable
+    defaultValue: true
+    fromVersion: "1.30"
 ---
 Enable a single HTTP endpoint `/discovery/<version>` which
 supports native HTTP caching with ETags containing all APIResources known to the API server.