Skip to content

Commit 674448d

Browse files
authored
Merge pull request #44349 from tengqm/configapi-1.29
Config API for v1.29
2 parents 88f8d0c + 2fe79a7 commit 674448d

24 files changed

+1374
-1942
lines changed

content/en/docs/concepts/configuration/manage-resources-containers.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -571,7 +571,7 @@ Cluster-level extended resources are not tied to nodes. They are usually managed
571571
by scheduler extenders, which handle the resource consumption and resource quota.
572572

573573
You can specify the extended resources that are handled by scheduler extenders
574-
in [scheduler configuration](/docs/reference/config-api/kube-scheduler-config.v1beta3/)
574+
in [scheduler configuration](/docs/reference/config-api/kube-scheduler-config.v1/)
575575

576576
**Example:**
577577

@@ -817,6 +817,6 @@ memory limit (and possibly request) for that container.
817817
* Read how the API reference defines a [container](/docs/reference/kubernetes-api/workload-resources/pod-v1/#Container)
818818
and its [resource requirements](/docs/reference/kubernetes-api/workload-resources/pod-v1/#resources)
819819
* Read about [project quotas](https://www.linux.org/docs/man8/xfs_quota.html) in XFS
820-
* Read more about the [kube-scheduler configuration reference (v1beta3)](/docs/reference/config-api/kube-scheduler-config.v1beta3/)
820+
* Read more about the [kube-scheduler configuration reference (v1)](/docs/reference/config-api/kube-scheduler-config.v1/)
821821
* Read more about [Quality of Service classes for Pods](/docs/concepts/workloads/pods/pod-qos/)
822822

content/en/docs/concepts/scheduling-eviction/kube-scheduler.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ of the scheduler:
8686
* Read about [scheduler performance tuning](/docs/concepts/scheduling-eviction/scheduler-perf-tuning/)
8787
* Read about [Pod topology spread constraints](/docs/concepts/scheduling-eviction/topology-spread-constraints/)
8888
* Read the [reference documentation](/docs/reference/command-line-tools-reference/kube-scheduler/) for kube-scheduler
89-
* Read the [kube-scheduler config (v1beta3)](/docs/reference/config-api/kube-scheduler-config.v1beta3/) reference
89+
* Read the [kube-scheduler config (v1)](/docs/reference/config-api/kube-scheduler-config.v1/) reference
9090
* Learn about [configuring multiple schedulers](/docs/tasks/extend-kubernetes/configure-multiple-schedulers/)
9191
* Learn about [topology management policies](/docs/tasks/administer-cluster/topology-manager/)
9292
* Learn about [Pod Overhead](/docs/concepts/scheduling-eviction/pod-overhead/)

content/en/docs/concepts/scheduling-eviction/resource-bin-packing.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ To set the `MostAllocated` strategy for the `NodeResourcesFit` plugin, use a
2323
[scheduler configuration](/docs/reference/scheduling/config) similar to the following:
2424

2525
```yaml
26-
apiVersion: kubescheduler.config.k8s.io/v1beta3
26+
apiVersion: kubescheduler.config.k8s.io/v1
2727
kind: KubeSchedulerConfiguration
2828
profiles:
2929
- pluginConfig:
@@ -43,7 +43,7 @@ profiles:
4343
```
4444
4545
To learn more about other parameters and their default configuration, see the API documentation for
46-
[`NodeResourcesFitArgs`](/docs/reference/config-api/kube-scheduler-config.v1beta3/#kubescheduler-config-k8s-io-v1beta3-NodeResourcesFitArgs).
46+
[`NodeResourcesFitArgs`](/docs/reference/config-api/kube-scheduler-config.v1/#kubescheduler-config-k8s-io-v1-NodeResourcesFitArgs).
4747

4848
## Enabling bin packing using RequestedToCapacityRatio
4949

@@ -53,7 +53,7 @@ allows users to bin pack extended resources by using appropriate parameters
5353
to improve the utilization of scarce resources in large clusters. It favors nodes according to a
5454
configured function of the allocated resources. The behavior of the `RequestedToCapacityRatio` in
5555
the `NodeResourcesFit` score function can be controlled by the
56-
[scoringStrategy](/docs/reference/config-api/kube-scheduler-config.v1beta3/#kubescheduler-config-k8s-io-v1beta3-ScoringStrategy) field.
56+
[scoringStrategy](/docs/reference/config-api/kube-scheduler-config.v1/#kubescheduler-config-k8s-io-v1-ScoringStrategy) field.
5757
Within the `scoringStrategy` field, you can configure two parameters: `requestedToCapacityRatio` and
5858
`resources`. The `shape` in the `requestedToCapacityRatio`
5959
parameter allows the user to tune the function as least requested or most
@@ -66,7 +66,7 @@ the bin packing behavior for extended resources `intel.com/foo` and `intel.com/b
6666
using the `requestedToCapacityRatio` field.
6767

6868
```yaml
69-
apiVersion: kubescheduler.config.k8s.io/v1beta3
69+
apiVersion: kubescheduler.config.k8s.io/v1
7070
kind: KubeSchedulerConfiguration
7171
profiles:
7272
- pluginConfig:
@@ -92,7 +92,7 @@ flag `--config=/path/to/config/file` will pass the configuration to the
9292
scheduler.
9393

9494
To learn more about other parameters and their default configuration, see the API documentation for
95-
[`NodeResourcesFitArgs`](/docs/reference/config-api/kube-scheduler-config.v1beta3/#kubescheduler-config-k8s-io-v1beta3-NodeResourcesFitArgs).
95+
[`NodeResourcesFitArgs`](/docs/reference/config-api/kube-scheduler-config.v1/#kubescheduler-config-k8s-io-v1-NodeResourcesFitArgs).
9696

9797
### Tuning the score function
9898

content/en/docs/concepts/scheduling-eviction/scheduler-perf-tuning.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ If you set `percentageOfNodesToScore` above 100, kube-scheduler acts as if you
4343
had set a value of 100.
4444

4545
To change the value, edit the
46-
[kube-scheduler configuration file](/docs/reference/config-api/kube-scheduler-config.v1beta3/)
46+
[kube-scheduler configuration file](/docs/reference/config-api/kube-scheduler-config.v1/)
4747
and then restart the scheduler.
4848
In many cases, the configuration file can be found at `/etc/kubernetes/config/kube-scheduler.yaml`.
4949

@@ -161,5 +161,5 @@ After going over all the Nodes, it goes back to Node 1.
161161

162162
## {{% heading "whatsnext" %}}
163163

164-
* Check the [kube-scheduler configuration reference (v1beta3)](/docs/reference/config-api/kube-scheduler-config.v1beta3/)
164+
* Check the [kube-scheduler configuration reference (v1)](/docs/reference/config-api/kube-scheduler-config.v1/)
165165

content/en/docs/reference/_index.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,8 @@ operator to use or manage a cluster.
8484
* [kubelet configuration (v1alpha1)](/docs/reference/config-api/kubelet-config.v1alpha1/) and
8585
[kubelet configuration (v1beta1)](/docs/reference/config-api/kubelet-config.v1beta1/)
8686
[kubelet configuration (v1)](/docs/reference/config-api/kubelet-config.v1/)
87-
* [kubelet credential providers (v1alpha1)](/docs/reference/config-api/kubelet-credentialprovider.v1alpha1/),
88-
[kubelet credential providers (v1beta1)](/docs/reference/config-api/kubelet-credentialprovider.v1beta1/) and
89-
[kubelet credential providers (v1)](/docs/reference/config-api/kubelet-credentialprovider.v1/)
90-
[kube-scheduler configuration (v1beta3)](/docs/reference/config-api/kube-scheduler-config.v1beta3/) and
87+
* [kubelet credential providers (v1)](/docs/reference/config-api/kubelet-credentialprovider.v1/)
88+
* [kube-scheduler configuration (v1beta3)](/docs/reference/config-api/kube-scheduler-config.v1beta3/) and
9189
[kube-scheduler configuration (v1)](/docs/reference/config-api/kube-scheduler-config.v1/)
9290
* [kube-controller-manager configuration (v1alpha1)](/docs/reference/config-api/kube-controller-manager-config.v1alpha1/)
9391
* [kube-proxy configuration (v1alpha1)](/docs/reference/config-api/kube-proxy-config.v1alpha1/)

content/en/docs/reference/config-api/apiserver-admission.v1.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ requested. e.g. a patch can result in either a CREATE or UPDATE Operation.</p>
152152
</td>
153153
</tr>
154154
<tr><td><code>userInfo</code> <B>[Required]</B><br/>
155-
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#userinfo-v1-authentication-k8s-io"><code>authentication/v1.UserInfo</code></a>
155+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#userinfo-v1-authentication-k8s-io"><code>authentication/v1.UserInfo</code></a>
156156
</td>
157157
<td>
158158
<p>UserInfo is information about the requesting user</p>
@@ -226,7 +226,7 @@ This must be copied over from the corresponding AdmissionRequest.</p>
226226
</td>
227227
</tr>
228228
<tr><td><code>status</code><br/>
229-
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#status-v1-meta"><code>meta/v1.Status</code></a>
229+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#status-v1-meta"><code>meta/v1.Status</code></a>
230230
</td>
231231
<td>
232232
<p>Result contains extra details into why an admission request was denied.

content/en/docs/reference/config-api/apiserver-audit.v1.md

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,14 @@ For non-resource requests, this is the lower-cased HTTP method.</p>
7171
</td>
7272
</tr>
7373
<tr><td><code>user</code> <B>[Required]</B><br/>
74-
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#userinfo-v1-authentication-k8s-io"><code>authentication/v1.UserInfo</code></a>
74+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#userinfo-v1-authentication-k8s-io"><code>authentication/v1.UserInfo</code></a>
7575
</td>
7676
<td>
7777
<p>Authenticated user information.</p>
7878
</td>
7979
</tr>
8080
<tr><td><code>impersonatedUser</code><br/>
81-
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#userinfo-v1-authentication-k8s-io"><code>authentication/v1.UserInfo</code></a>
81+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#userinfo-v1-authentication-k8s-io"><code>authentication/v1.UserInfo</code></a>
8282
</td>
8383
<td>
8484
<p>Impersonated user information.</p>
@@ -116,7 +116,7 @@ Does not apply for List-type requests, or non-resource requests.</p>
116116
</td>
117117
</tr>
118118
<tr><td><code>responseStatus</code><br/>
119-
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#status-v1-meta"><code>meta/v1.Status</code></a>
119+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#status-v1-meta"><code>meta/v1.Status</code></a>
120120
</td>
121121
<td>
122122
<p>The response status, populated even when the ResponseObject is not a Status type.
@@ -144,14 +144,14 @@ at Response Level.</p>
144144
</td>
145145
</tr>
146146
<tr><td><code>requestReceivedTimestamp</code><br/>
147-
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#microtime-v1-meta"><code>meta/v1.MicroTime</code></a>
147+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#microtime-v1-meta"><code>meta/v1.MicroTime</code></a>
148148
</td>
149149
<td>
150150
<p>Time the request reached the apiserver.</p>
151151
</td>
152152
</tr>
153153
<tr><td><code>stageTimestamp</code><br/>
154-
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#microtime-v1-meta"><code>meta/v1.MicroTime</code></a>
154+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#microtime-v1-meta"><code>meta/v1.MicroTime</code></a>
155155
</td>
156156
<td>
157157
<p>Time the request reached current audit stage.</p>
@@ -188,7 +188,7 @@ should be short. Annotations are included in the Metadata level.</p>
188188

189189

190190
<tr><td><code>metadata</code><br/>
191-
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#listmeta-v1-meta"><code>meta/v1.ListMeta</code></a>
191+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#listmeta-v1-meta"><code>meta/v1.ListMeta</code></a>
192192
</td>
193193
<td>
194194
<span class="text-muted">No description provided.</span></td>
@@ -223,7 +223,7 @@ categories are logged.</p>
223223

224224

225225
<tr><td><code>metadata</code><br/>
226-
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#objectmeta-v1-meta"><code>meta/v1.ObjectMeta</code></a>
226+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#objectmeta-v1-meta"><code>meta/v1.ObjectMeta</code></a>
227227
</td>
228228
<td>
229229
<p>ObjectMeta is included for interoperability with API infrastructure.</p>
@@ -278,7 +278,7 @@ in a rule will override the global default.</p>
278278

279279

280280
<tr><td><code>metadata</code><br/>
281-
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#listmeta-v1-meta"><code>meta/v1.ListMeta</code></a>
281+
<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#listmeta-v1-meta"><code>meta/v1.ListMeta</code></a>
282282
</td>
283283
<td>
284284
<span class="text-muted">No description provided.</span></td>
@@ -321,12 +321,14 @@ The empty string represents the core API group.</p>
321321
</td>
322322
<td>
323323
<p>Resources is a list of resources this rule applies to.</p>
324-
<p>For example:
325-
'pods' matches pods.
326-
'pods/log' matches the log subresource of pods.
327-
'&ast;' matches all resources and their subresources.
328-
'pods/&ast;' matches all subresources of pods.
329-
'&ast;/scale' matches all scale subresources.</p>
324+
<p>For example:</p>
325+
<ul>
326+
<li><code>pods</code> matches pods.</li>
327+
<li><code>pods/log</code> matches the log subresource of pods.</li>
328+
<li><code>*</code> matches all resources and their subresources.</li>
329+
<li><code>pods/*</code> matches all subresources of pods.</li>
330+
<li><code>*/scale</code> matches all scale subresources.</li>
331+
</ul>
330332
<p>If wildcard is present, the validation rule will ensure resources do not
331333
overlap with each other.</p>
332334
<p>An empty list implies all resources and subresources in this API groups apply.</p>
@@ -500,10 +502,12 @@ An empty list implies every namespace.</p>
500502
</td>
501503
<td>
502504
<p>NonResourceURLs is a set of URL paths that should be audited.
503-
&ast;s are allowed, but only as the full, final step in the path.
504-
Examples:
505-
&quot;/metrics&quot; - Log requests for apiserver metrics
506-
&quot;/healthz&ast;&quot; - Log all health checks</p>
505+
<code>*</code>s are allowed, but only as the full, final step in the path.
506+
Examples:</p>
507+
<ul>
508+
<li><code>/metrics</code> - Log requests for apiserver metrics</li>
509+
<li><code>/healthz*</code> - Log all health checks</li>
510+
</ul>
507511
</td>
508512
</tr>
509513
<tr><td><code>omitStages</code><br/>
@@ -551,4 +555,4 @@ Policy.OmitManagedFields will stand.</li>
551555

552556

553557

554-
558+

0 commit comments

Comments
 (0)