Skip to content

Commit 6c7b885

Browse files
authored
Merge pull request #47304 from hacktivist123/merged-main-dev-1.31
Merged main dev 1.31
2 parents e17eed9 + e6d2e14 commit 6c7b885

File tree

58 files changed

+4249
-209
lines changed

Some content is hidden

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

58 files changed

+4249
-209
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
<!--
2-
32
Hello!
43
5-
Remember to ADD A DESCRIPTION and delete this note before submitting
6-
your pull request. The description should explain what will change,
7-
and why.
8-
94
PLEASE title the FIRST commit appropriately, so that if you squash all
105
your commits into one, the combined commit message makes sense.
116
For overall help on editing and submitting pull requests, visit:
@@ -20,5 +15,24 @@
2015
2116
If you're documenting a feature that will be part of a future release, see
2217
https://kubernetes.io/docs/contribute/new-content/new-features/ for advice.
18+
-->
19+
### Description
2320

21+
<!--
22+
Remember to ADD A DESCRIPTION and delete this note before submitting
23+
your pull request. The description should explain what will change,
24+
and why.
25+
-->
26+
27+
### Issue
28+
29+
<!--
30+
If this pull request resolves an open issue, please link the issue in the PR
31+
description so it will automatically close when the PR is merged.
32+
33+
See the GitHub documentation for more details and other options:
34+
35+
https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword
2436
-->
37+
38+
Closes: #

OWNERS_ALIASES

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ aliases:
127127
- bells17
128128
- inductor
129129
- nasa9084
130+
- Okabe-Junya
130131
sig-docs-ja-reviews: # PR reviews for Japanese content
131132
- atoato88
132133
- bells17

content/bn/examples/service/networking/example-ingress.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ apiVersion: networking.k8s.io/v1
22
kind: Ingress
33
metadata:
44
name: example-ingress
5-
annotations:
6-
nginx.ingress.kubernetes.io/rewrite-target: /$1
75
spec:
86
ingressClassName: nginx
97
rules:

content/de/docs/reference/glossary/cloud-controller-manager.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ tags:
1111
- architecture
1212
- operation
1313
---
14-
Eine Kubernetes {{< glossary_tooltip text="Control Plane" term_id="control-plane" >}} Komponente, die Cloud spezifische Kontrolllogik einbettet. Der [Cloud Controller Manager](/docs/concepts/architecture/cloud-controller/) lässt Sie Ihr Cluster in die Cloud Provider API einbinden, und trennt die Komponenten die mit der Cloud Platform interagieren von Komponenten, die nur mit Ihrem Cluster interagieren.
14+
Eine Kubernetes {{< glossary_tooltip text="Control Plane" term_id="control-plane" >}} Komponente, die Cloud spezifische Kontrolllogik einbettet. Der Cloud Controller Manager lässt Sie Ihr Cluster in die Cloud Provider API einbinden, und trennt die Komponenten die mit der Cloud Platform interagieren von Komponenten, die nur mit Ihrem Cluster interagieren.
1515

1616
<!--more-->
1717

content/en/docs/concepts/configuration/secret.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ have Kubernetes make the value of that Secret be available as a file inside
524524
the filesystem of one or more of the Pod's containers.
525525

526526
For instructions, refer to
527-
[Distribute credentials securely using Secrets](/docs/tasks/inject-data-application/distribute-credentials-secure/#create-a-pod-that-has-access-to-the-secret-data-through-a-volume).
527+
[Create a Pod that has access to the secret data through a Volume](/docs/tasks/inject-data-application/distribute-credentials-secure/#create-a-pod-that-has-access-to-the-secret-data-through-a-volume).
528528

529529
When a volume contains data from a Secret, and that Secret is updated, Kubernetes tracks
530530
this and updates the data in the volume, using an eventually-consistent approach.

content/en/docs/concepts/containers/container-lifecycle-hooks.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,10 @@ When a Container lifecycle management hook is called,
6464
the Kubernetes management system executes the handler according to the hook action,
6565
`httpGet` , `tcpSocket` and `sleep` are executed by the kubelet process, and `exec` is executed in the container.
6666

67-
Hook handler calls are synchronous within the context of the Pod containing the Container.
68-
This means that for a `PostStart` hook,
69-
the Container ENTRYPOINT and hook fire asynchronously.
70-
However, if the hook takes too long to run or hangs,
71-
the Container cannot reach a `running` state.
67+
The `PostStart` hook handler call is initiated when a container is created,
68+
meaning the container ENTRYPOINT and the `PostStart` hook are triggered simultaneously.
69+
However, if the `PostStart` hook takes too long to execute or if it hangs,
70+
it can prevent the container from transitioning to a `running` state.
7271

7372
`PreStop` hooks are not executed asynchronously from the signal to stop the Container; the hook must
7473
complete its execution before the TERM signal can be sent. If a `PreStop` hook hangs during

content/en/docs/concepts/extend-kubernetes/api-extension/custom-resources.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,9 @@ The [CustomResourceDefinition](/docs/tasks/extend-kubernetes/custom-resources/cu
161161
API resource allows you to define custom resources.
162162
Defining a CRD object creates a new custom resource with a name and schema that you specify.
163163
The Kubernetes API serves and handles the storage of your custom resource.
164-
The name of a CRD object must be a valid
165-
[DNS subdomain name](/docs/concepts/overview/working-with-objects/names#dns-subdomain-names).
164+
The name of the CRD object itself must be a valid
165+
[DNS subdomain name](/docs/concepts/overview/working-with-objects/names#dns-subdomain-names) derived from the defined resource name and its API group; see [how to create a CRD](/docs/tasks/extend-kubernetes/custom-resources/custom-resource-definitions#create-a-customresourcedefinition) for more details.
166+
Further, the name of an object whose kind/resource is defined by a CRD must also be a valid DNS subdomain name.
166167

167168
This frees you from writing your own API server to handle the custom resource,
168169
but the generic nature of the implementation means you have less flexibility than with
@@ -223,6 +224,7 @@ Aggregated APIs offer more advanced API features and customization of other feat
223224
| strategic-merge-patch | The new endpoints support PATCH with `Content-Type: application/strategic-merge-patch+json`. Useful for updating objects that may be modified both locally, and by the server. For more information, see ["Update API Objects in Place Using kubectl patch"](/docs/tasks/manage-kubernetes-objects/update-api-object-kubectl-patch/) | No | Yes |
224225
| Protocol Buffers | The new resource supports clients that want to use Protocol Buffers | No | Yes |
225226
| OpenAPI Schema | Is there an OpenAPI (swagger) schema for the types that can be dynamically fetched from the server? Is the user protected from misspelling field names by ensuring only allowed fields are set? Are types enforced (in other words, don't put an `int` in a `string` field?) | Yes, based on the [OpenAPI v3.0 validation](/docs/tasks/extend-kubernetes/custom-resources/custom-resource-definitions/#validation) schema (GA in 1.16). | Yes |
227+
| Instance Name | Does this extension mechanism impose any constraints on the names of objects whose kind/resource is defined this way? | Yes, such an object's name must be a valid DNS subdomain name. | No |
226228

227229
### Common Features
228230

content/en/docs/concepts/workloads/pods/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ Kubernetes. In the future, this list may be expanded.
132132

133133
In Kubernetes v{{< skew currentVersion >}}, the value of `.spec.os.name` does not affect
134134
how the {{< glossary_tooltip text="kube-scheduler" term_id="kube-scheduler" >}}
135-
picks a Pod to run a node. In any cluster where there is more than one operating system for
135+
picks a node for the Pod to run on. In any cluster where there is more than one operating system for
136136
running nodes, you should set the
137137
[kubernetes.io/os](/docs/reference/labels-annotations-taints/#kubernetes-io-os)
138138
label correctly on each node, and define pods with a `nodeSelector` based on the operating system
@@ -410,4 +410,4 @@ To understand the context for why Kubernetes wraps a common Pod API in other res
410410
* [Borg](https://research.google.com/pubs/pub43438.html)
411411
* [Marathon](https://mesosphere.github.io/marathon/docs/rest-api.html)
412412
* [Omega](https://research.google/pubs/pub41684/)
413-
* [Tupperware](https://engineering.fb.com/data-center-engineering/tupperware/).
413+
* [Tupperware](https://engineering.fb.com/data-center-engineering/tupperware/).

content/en/docs/reference/command-line-tools-reference/feature-gates/container-checkpoint.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ stages:
99
- stage: alpha
1010
defaultValue: false
1111
fromVersion: "1.25"
12+
toVersion: "1.29"
13+
- stage: beta
14+
defaultValue: true
15+
fromVersion: "1.30"
1216
---
1317
Enables the kubelet `checkpoint` API.
1418
See [Kubelet Checkpoint API](/docs/reference/node/kubelet-checkpoint-api/) for more details.

content/en/docs/reference/command-line-tools-reference/feature-gates/evented-pleg.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@ _build:
88
stages:
99
- stage: alpha
1010
defaultValue: false
11-
fromVersion: "1.26"
12-
toVersion: "1.26"
13-
- stage: beta
14-
defaultValue: false
15-
fromVersion: "1.27"
11+
fromVersion: "1.25"
1612
---
1713
Enable support for the kubelet to receive container life cycle events from the
1814
{{< glossary_tooltip text="container runtime" term_id="container-runtime" >}} via

0 commit comments

Comments
 (0)