Skip to content

Commit 04aa059

Browse files
authored
Merge branch 'kubernetes:main' into holgers66_l10n_de_20240130_1
2 parents f23c41c + fd764e3 commit 04aa059

File tree

69 files changed

+3634
-344
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+3634
-344
lines changed

OWNERS_ALIASES

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,16 @@ aliases:
22
sig-docs-blog-owners: # Approvers for blog content
33
- mrbobbytables
44
- nate-double-u
5-
- onlydole
65
- sftim
76
sig-docs-blog-reviewers: # Reviewers for blog content
87
- Gauravpadam
98
- mrbobbytables
109
- nate-double-u
11-
- onlydole
1210
- sftim
1311
sig-docs-localization-owners: # Admins for localization content
1412
- a-mccarthy
1513
- divya-mohan0209
1614
- natalisucks
17-
- onlydole
1815
- reylejano
1916
- sftim
2017
- seokho-son
@@ -32,7 +29,6 @@ aliases:
3229
- katcosgrove # RT 1.30 Lead
3330
- natalisucks
3431
- nate-double-u
35-
- onlydole
3632
- reylejano
3733
- sftim
3834
- tengqm
@@ -45,7 +41,6 @@ aliases:
4541
- mengjiao-liu
4642
- natalisucks
4743
- nate-double-u
48-
- onlydole
4944
- reylejano
5045
- sftim
5146
- shannonxtreme
@@ -126,7 +121,6 @@ aliases:
126121
sig-docs-leads: # Website chairs and tech leads
127122
- divya-mohan0209
128123
- natalisucks
129-
- onlydole
130124
- reylejano
131125
- sftim
132126
- tengqm
@@ -231,7 +225,7 @@ aliases:
231225
- jimangel # Release Manager Associate
232226
- jrsapi # Release Manager Associate
233227
- salaxander # Release Manager Associate
234-
# authoritative source: https://github.com/kubernetes/committee-security-response/blob/main/OWNERS_ALIASES
228+
# authoritative source: https://github.com/kubernetes/committee-security-response/blob/main/OWNERS_ALIASES
235229
committee-security-response:
236230
- cjcullen
237231
- cji
@@ -241,7 +235,7 @@ aliases:
241235
- ritazh
242236
- SaranBalaji90
243237
- tabbysable
244-
# authoritative source: https://github.com/kubernetes/sig-security/blob/main/OWNERS_ALIASES
238+
# authoritative source: https://github.com/kubernetes/sig-security/blob/main/OWNERS_ALIASES
245239
sig-security-leads:
246240
- IanColdwater
247241
- tabbysable

content/en/docs/concepts/architecture/garbage-collection.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ until disk usage reaches the `LowThresholdPercent` value.
139139

140140
#### Garbage collection for unused container images {#image-maximum-age-gc}
141141

142-
{{< feature-state for_k8s_version="v1.29" state="alpha" >}}
142+
{{< feature-state feature_gate_name="ImageMaximumGCAge" >}}
143143

144144
As an alpha feature, you can specify the maximum time a local image can be unused for,
145145
regardless of disk usage. This is a kubelet setting that you configure for each node.

content/en/docs/concepts/architecture/leases.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ instances are on stand-by.
3333

3434
## API server identity
3535

36-
{{< feature-state for_k8s_version="v1.26" state="beta" >}}
36+
{{< feature-state feature_gate_name="APIServerIdentity" >}}
3737

3838
Starting in Kubernetes v1.26, each `kube-apiserver` uses the Lease API to publish its identity to the
3939
rest of the system. While not particularly useful on its own, this provides a mechanism for clients to

content/en/docs/concepts/architecture/mixed-version-proxy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ weight: 220
88

99
<!-- overview -->
1010

11-
{{< feature-state state="alpha" for_k8s_version="v1.28" >}}
11+
{{< feature-state feature_gate_name="UnknownVersionInteroperabilityProxy" >}}
1212

1313
Kubernetes {{< skew currentVersion >}} includes an alpha feature that lets an
1414
{{< glossary_tooltip text="API Server" term_id="kube-apiserver" >}}

content/en/docs/concepts/architecture/nodes.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ If you want to explicitly reserve resources for non-Pod processes, see
280280

281281
## Node topology
282282

283-
{{< feature-state state="stable" for_k8s_version="v1.27" >}}
283+
{{< feature-state feature_gate_name="TopologyManager" >}}
284284

285285
If you have enabled the `TopologyManager`
286286
[feature gate](/docs/reference/command-line-tools-reference/feature-gates/), then
@@ -290,7 +290,7 @@ for more information.
290290

291291
## Graceful node shutdown {#graceful-node-shutdown}
292292

293-
{{< feature-state state="beta" for_k8s_version="v1.21" >}}
293+
{{< feature-state feature_gate_name="GracefulNodeShutdown" >}}
294294

295295
The kubelet attempts to detect node system shutdown and terminates pods running on the node.
296296

@@ -374,7 +374,7 @@ Message: Pod was terminated in response to imminent node shutdown.
374374

375375
### Pod Priority based graceful node shutdown {#pod-priority-graceful-node-shutdown}
376376

377-
{{< feature-state state="beta" for_k8s_version="v1.24" >}}
377+
{{< feature-state feature_gate_name="GracefulNodeShutdownBasedOnPodPriority" >}}
378378

379379
To provide more flexibility during graceful node shutdown around the ordering
380380
of pods during shutdown, graceful node shutdown honors the PriorityClass for
@@ -471,7 +471,7 @@ are emitted under the kubelet subsystem to monitor node shutdowns.
471471

472472
## Non-graceful node shutdown handling {#non-graceful-node-shutdown}
473473

474-
{{< feature-state state="stable" for_k8s_version="v1.28" >}}
474+
{{< feature-state feature_gate_name="NodeOutOfServiceVolumeDetach" >}}
475475

476476
A node shutdown action may not be detected by kubelet's Node Shutdown Manager,
477477
either because the command does not trigger the inhibitor locks mechanism used by
@@ -515,7 +515,7 @@ During a non-graceful shutdown, Pods are terminated in the two phases:
515515

516516
## Swap memory management {#swap-memory}
517517

518-
{{< feature-state state="beta" for_k8s_version="v1.28" >}}
518+
{{< feature-state feature_gate_name="NodeSwap" >}}
519519

520520
To enable swap on a node, the `NodeSwap` feature gate must be enabled on
521521
the kubelet, and the `--fail-swap-on` command line flag or `failSwapOn`

content/en/docs/concepts/cluster-administration/system-logs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ The `logrotate` tool rotates logs daily, or once the log size is greater than 10
238238

239239
## Log query
240240

241-
{{< feature-state for_k8s_version="v1.27" state="alpha" >}}
241+
{{< feature-state feature_gate_name="NodeLogQuery" >}}
242242

243243
To help with debugging issues on nodes, Kubernetes v1.27 introduced a feature that allows viewing logs of services
244244
running on the node. To use the feature, ensure that the `NodeLogQuery`

content/en/docs/concepts/cluster-administration/system-traces.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ For more information about the `TracingConfiguration` struct, see
7676

7777
### kubelet traces
7878

79-
{{< feature-state for_k8s_version="v1.27" state="beta" >}}
79+
{{< feature-state feature_gate_name="KubeletTracing" >}}
8080

8181
The kubelet CRI interface and authenticated http servers are instrumented to generate
8282
trace spans. As with the apiserver, the endpoint and sampling rate are configurable.

content/en/docs/concepts/containers/images.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ which is 300 seconds (5 minutes).
161161

162162
### Image pull per runtime class
163163

164-
{{< feature-state for_k8s_version="v1.29" state="alpha" >}}
164+
{{< feature-state feature_gate_name="RuntimeClassInImageCriApi" >}}
165165
Kubernetes includes alpha support for performing image pulls based on the RuntimeClass of a Pod.
166166

167167
If you enable the `RuntimeClassInImageCriApi` [feature gate](/docs/reference/command-line-tools-reference/feature-gates/),

content/en/docs/concepts/overview/components.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ as well as detecting and responding to cluster events (for example, starting up
3131
`{{< glossary_tooltip text="replicas" term_id="replica" >}}` field is unsatisfied).
3232

3333
Control plane components can be run on any machine in the cluster. However,
34-
for simplicity, set up scripts typically start all control plane components on
34+
for simplicity, setup scripts typically start all control plane components on
3535
the same machine, and do not run user containers on this machine. See
3636
[Creating Highly Available clusters with kubeadm](/docs/setup/production-environment/tools/kubeadm/high-availability/)
3737
for an example control plane setup that runs across multiple machines.
@@ -150,4 +150,4 @@ Learn more about the following:
150150
* Etcd's official [documentation](https://etcd.io/docs/).
151151
* Several [container runtimes](/docs/setup/production-environment/container-runtimes/) in Kubernetes.
152152
* Integrating with cloud providers using [cloud-controller-manager](/docs/concepts/architecture/cloud-controller/).
153-
* [kubectl](/docs/reference/generated/kubectl/kubectl-commands) commands.
153+
* [kubectl](/docs/reference/generated/kubectl/kubectl-commands) commands.

content/en/docs/concepts/scheduling-eviction/assign-pod-node.md

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ null `namespaceSelector` matches the namespace of the Pod where the rule is defi
360360

361361
#### matchLabelKeys
362362

363-
{{< feature-state for_k8s_version="v1.29" state="alpha" >}}
363+
{{< feature-state feature_gate_name="MatchLabelKeysInPodAffinity" >}}
364364

365365
{{< note >}}
366366
<!-- UPDATE THIS WHEN PROMOTING TO BETA -->
@@ -391,26 +391,27 @@ metadata:
391391
...
392392
spec:
393393
template:
394-
affinity:
395-
podAffinity:
396-
requiredDuringSchedulingIgnoredDuringExecution:
397-
- labelSelector:
398-
matchExpressions:
399-
- key: app
400-
operator: In
401-
values:
402-
- database
403-
topologyKey: topology.kubernetes.io/zone
404-
# Only Pods from a given rollout are taken into consideration when calculating pod affinity.
405-
# If you update the Deployment, the replacement Pods follow their own affinity rules
406-
# (if there are any defined in the new Pod template)
407-
matchLabelKeys:
408-
- pod-template-hash
394+
spec:
395+
affinity:
396+
podAffinity:
397+
requiredDuringSchedulingIgnoredDuringExecution:
398+
- labelSelector:
399+
matchExpressions:
400+
- key: app
401+
operator: In
402+
values:
403+
- database
404+
topologyKey: topology.kubernetes.io/zone
405+
# Only Pods from a given rollout are taken into consideration when calculating pod affinity.
406+
# If you update the Deployment, the replacement Pods follow their own affinity rules
407+
# (if there are any defined in the new Pod template)
408+
matchLabelKeys:
409+
- pod-template-hash
409410
```
410411

411412
#### mismatchLabelKeys
412413

413-
{{< feature-state for_k8s_version="v1.29" state="alpha" >}}
414+
{{< feature-state feature_gate_name="MatchLabelKeysInPodAffinity" >}}
414415

415416
{{< note >}}
416417
<!-- UPDATE THIS WHEN PROMOTING TO BETA -->

0 commit comments

Comments
 (0)