Skip to content

Commit dd5fd20

Browse files
authored
Merge branch 'kubernetes:main' into patch-1
2 parents 28ae4d7 + 4fe8c26 commit dd5fd20

File tree

142 files changed

+5064
-2296
lines changed

Some content is hidden

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

142 files changed

+5064
-2296
lines changed

OWNERS_ALIASES

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,11 @@ aliases:
148148
- divya-mohan0209
149149
- jimangel
150150
- kbhawkey
151+
- natalisucks
151152
- onlydole
153+
- reylejano
152154
- sftim
155+
- tengqm
153156
sig-docs-zh-owners: # Admins for Chinese content
154157
# chenopis
155158
- chenrui333
@@ -242,7 +245,6 @@ aliases:
242245
# authoritative source: https://git.k8s.io/sig-release/OWNERS_ALIASES
243246
sig-release-leads:
244247
- cpanato # SIG Technical Lead
245-
- hasheddan # SIG Technical Lead
246248
- jeremyrickard # SIG Technical Lead
247249
- justaugustus # SIG Chair
248250
- LappleApple # SIG Program Manager

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ allows the clean up of resources like the following:
1313
* [Objects without owner references](#owners-dependents)
1414
* [Unused containers and container images](#containers-images)
1515
* [Dynamically provisioned PersistentVolumes with a StorageClass reclaim policy of Delete](/docs/concepts/storage/persistent-volumes/#delete)
16-
* [Stale or expired CertificateSigningRequests (CSRs)](/reference/access-authn-authz/certificate-signing-requests/#request-signing-process)
16+
* [Stale or expired CertificateSigningRequests (CSRs)](/docs/reference/access-authn-authz/certificate-signing-requests/#request-signing-process)
1717
* {{<glossary_tooltip text="Nodes" term_id="node">}} deleted in the following scenarios:
1818
* On a cloud when the cluster uses a [cloud controller manager](/docs/concepts/architecture/cloud-controller/)
1919
* On-premises when the cluster uses an addon similar to a cloud controller

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ Mi, Ki. For example, the following represent roughly the same value:
134134
128974848, 129e6, 129M, 128974848000m, 123Mi
135135
```
136136

137-
Take care about case for suffixes. If you request `400m` of memory, this is a request
137+
Pay attention to the case of the suffixes. If you request `400m` of memory, this is a request
138138
for 0.4 bytes. Someone who types that probably meant to ask for 400 mebibytes (`400Mi`)
139139
or 400 megabytes (`400M`).
140140

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ specific Pods:
3333
## Node labels {#built-in-node-labels}
3434

3535
Like many other Kubernetes objects, nodes have
36-
[labels](/docs/concepts/overview/working-with-objects/labels/). You can [attach labels manually](/docs/tasks/confiure-pod-container/assign-pods-nodes/#add-a-label-to-a-node).
36+
[labels](/docs/concepts/overview/working-with-objects/labels/). You can [attach labels manually](/docs/tasks/configure-pod-container/assign-pods-nodes/#add-a-label-to-a-node).
3737
Kubernetes also populates a standard set of labels on all nodes in a cluster. See [Well-Known Labels, Annotations and Taints](/docs/reference/labels-annotations-taints/)
3838
for a list of common node labels.
3939

content/en/docs/concepts/scheduling-eviction/pod-overhead.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ spec:
7272
runtimeClassName: kata-fc
7373
containers:
7474
- name: busybox-ctr
75-
image: busybox
75+
image: busybox:1.28
7676
stdin: true
7777
tty: true
7878
resources:

content/en/docs/concepts/services-networking/service.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ spec:
125125
image: nginx:11.14.2
126126
ports:
127127
- containerPort: 80
128-
name: http-web-service
128+
name: http-web-svc
129129
130130
---
131131
apiVersion: v1
@@ -139,7 +139,7 @@ spec:
139139
- name: name-of-service-port
140140
protocol: TCP
141141
port: 80
142-
targetPort: http-web-service
142+
targetPort: http-web-svc
143143
```
144144

145145

content/en/docs/concepts/storage/ephemeral-volumes.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ metadata:
107107
spec:
108108
containers:
109109
- name: my-frontend
110-
image: busybox
110+
image: busybox:1.28
111111
volumeMounts:
112112
- mountPath: "/data"
113113
name: my-csi-inline-vol
@@ -125,9 +125,17 @@ driver. These attributes are specific to each driver and not
125125
standardized. See the documentation of each CSI driver for further
126126
instructions.
127127

128+
### CSI driver restrictions
129+
130+
{{< feature-state for_k8s_version="v1.21" state="deprecated" >}}
131+
128132
As a cluster administrator, you can use a [PodSecurityPolicy](/docs/concepts/policy/pod-security-policy/) to control which CSI drivers can be used in a Pod, specified with the
129133
[`allowedCSIDrivers` field](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#podsecuritypolicyspec-v1beta1-policy).
130134

135+
{{< note >}}
136+
PodSecurityPolicy is deprecated and will be removed in the Kubernetes v1.25 release.
137+
{{< /note >}}
138+
131139
### Generic ephemeral volumes
132140

133141
{{< feature-state for_k8s_version="v1.23" state="stable" >}}
@@ -158,7 +166,7 @@ metadata:
158166
spec:
159167
containers:
160168
- name: my-frontend
161-
image: busybox
169+
image: busybox:1.28
162170
volumeMounts:
163171
- mountPath: "/scratch"
164172
name: scratch-volume

content/en/docs/concepts/storage/projected-volumes.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Currently, the following types of volume sources can be projected:
2323
* [`secret`](/docs/concepts/storage/volumes/#secret)
2424
* [`downwardAPI`](/docs/concepts/storage/volumes/#downwardapi)
2525
* [`configMap`](/docs/concepts/storage/volumes/#configmap)
26-
* `serviceAccountToken`
26+
* [`serviceAccountToken`](#serviceaccounttoken)
2727

2828
All sources are required to be in the same namespace as the Pod. For more details,
2929
see the [all-in-one volume](https://github.com/kubernetes/design-proposals-archive/blob/main/node/all-in-one-volume.md) design document.
@@ -45,15 +45,17 @@ parameters are nearly the same with two exceptions:
4545
volume source. However, as illustrated above, you can explicitly set the `mode`
4646
for each individual projection.
4747

48+
## serviceAccountToken projected volumes {#serviceaccounttoken}
4849
When the `TokenRequestProjection` feature is enabled, you can inject the token
4950
for the current [service account](/docs/reference/access-authn-authz/authentication/#service-account-tokens)
5051
into a Pod at a specified path. For example:
5152

5253
{{< codenew file="pods/storage/projected-service-account-token.yaml" >}}
5354

5455
The example Pod has a projected volume containing the injected service account
55-
token. This token can be used by a Pod's containers to access the Kubernetes API
56-
server. The `audience` field contains the intended audience of the
56+
token. Containers in this Pod can use that token to access the Kubernetes API
57+
server, authenticating with the identity of [the pod's ServiceAccount](/docs/tasks/configure-pod-container/configure-service-account/).
58+
The `audience` field contains the intended audience of the
5759
token. A recipient of the token must identify itself with an identifier specified
5860
in the audience of the token, and otherwise should reject the token. This field
5961
is optional and it defaults to the identifier of the API server.

content/en/docs/concepts/storage/volumes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ metadata:
251251
spec:
252252
containers:
253253
- name: test
254-
image: busybox
254+
image: busybox:1.28
255255
volumeMounts:
256256
- name: config-vol
257257
mountPath: /etc/config
@@ -1128,7 +1128,7 @@ spec:
11281128
fieldRef:
11291129
apiVersion: v1
11301130
fieldPath: metadata.name
1131-
image: busybox
1131+
image: busybox:1.28
11321132
command: [ "sh", "-c", "while [ true ]; do echo 'Hello'; sleep 10; done | tee -a /logs/hello.txt" ]
11331133
volumeMounts:
11341134
- name: workdir1

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ spec:
180180
spec:
181181
containers:
182182
- name: hello
183-
image: busybox
183+
image: busybox:1.28
184184
command: ['sh', '-c', 'echo "Hello, Kubernetes!" && sleep 3600']
185185
restartPolicy: OnFailure
186186
# The pod template ends here

0 commit comments

Comments
 (0)