Skip to content

Commit 507cf1d

Browse files
Merge branch 'kubernetes:main' into juliafmorgado-kops
2 parents 67e39d3 + ef08cba commit 507cf1d

File tree

83 files changed

+3203
-1056
lines changed

Some content is hidden

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

83 files changed

+3203
-1056
lines changed

OWNERS_ALIASES

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,12 +216,14 @@ aliases:
216216
- aisonaku
217217
- potapy4
218218
- dianaabv
219+
- shurup
219220
sig-docs-ru-reviews: # PR reviews for Russian content
220221
- Arhell
221222
- msheldyakov
222223
- aisonaku
223224
- potapy4
224225
- dianaabv
226+
- shurup
225227
sig-docs-pl-owners: # Admins for Polish content
226228
- mfilocha
227229
- nvtkaszpir

content/en/blog/_posts/2022-11-04-live-and-let-live-with-kluctl-and-ssa.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ for the past 2 years. I describe Kluctl as "The missing glue to put together
2020
large Kubernetes deployments, composed of multiple smaller parts
2121
(Helm/Kustomize/...) in a manageable and unified way."
2222

23-
To get a basic understanding of Kluctl, I suggest to visit the [kluctl.io](https://kluctlio)
23+
To get a basic understanding of Kluctl, I suggest to visit the [kluctl.io](https://kluctl.io)
2424
website and read through the documentation and tutorials, for example the
2525
[microservices demo tutorial](https://kluctl.io/docs/guides/tutorials/microservices-demo/).
2626
As an alternative, you can watch [Hands-on Introduction to kluctl](https://www.youtube.com/watch?v=9LoYLjDjOdg)

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,8 @@ or 400 megabytes (`400M`).
346346
In the following example, the Pod has two containers. Each container has a request of
347347
2GiB of local ephemeral storage. Each container has a limit of 4GiB of local ephemeral
348348
storage. Therefore, the Pod has a request of 4GiB of local ephemeral storage, and
349-
a limit of 8GiB of local ephemeral storage.
349+
a limit of 8GiB of local ephemeral storage. 500Mi of that limit could be
350+
consumed by the `emptyDir` volume.
350351

351352
```yaml
352353
apiVersion: v1
@@ -377,7 +378,8 @@ spec:
377378
mountPath: "/tmp"
378379
volumes:
379380
- name: ephemeral
380-
emptyDir: {}
381+
emptyDir:
382+
sizeLimit: 500Mi
381383
```
382384

383385
### How Pods with ephemeral-storage requests are scheduled

content/en/docs/concepts/scheduling-eviction/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "Scheduling, Preemption and Eviction"
3-
weight: 90
3+
weight: 95
44
content_type: concept
55
description: >
66
In Kubernetes, scheduling refers to making sure that Pods are matched to Nodes
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "Security"
3-
weight: 81
3+
weight: 85
44
description: >
55
Concepts for keeping your cloud-native workload secure.
66
---

content/en/docs/concepts/storage/dynamic-provisioning.md

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ to represent them in Kubernetes. The dynamic provisioning feature eliminates
1919
the need for cluster administrators to pre-provision storage. Instead, it
2020
automatically provisions storage when it is requested by users.
2121

22-
23-
24-
2522
<!-- body -->
2623

2724
## Background
@@ -116,7 +113,7 @@ can enable this behavior by:
116113
is enabled on the API server.
117114

118115
An administrator can mark a specific `StorageClass` as default by adding the
119-
`storageclass.kubernetes.io/is-default-class` [annotation](/docs/reference/labels-annotations-taints/#storageclass-kubernetes-io-is-default-class) to it.
116+
[`storageclass.kubernetes.io/is-default-class` annotation](/docs/reference/labels-annotations-taints/#storageclass-kubernetes-io-is-default-class) to it.
120117
When a default `StorageClass` exists in a cluster and a user creates a
121118
`PersistentVolumeClaim` with `storageClassName` unspecified, the
122119
`DefaultStorageClass` admission controller automatically adds the
@@ -128,9 +125,9 @@ be created.
128125

129126
## Topology Awareness
130127

131-
In [Multi-Zone](/docs/setup/multiple-zones) clusters, Pods can be spread across
128+
In [Multi-Zone](/docs/setup/best-practices/multiple-zones/) clusters, Pods can be spread across
132129
Zones in a Region. Single-Zone storage backends should be provisioned in the Zones where
133-
Pods are scheduled. This can be accomplished by setting the [Volume Binding
134-
Mode](/docs/concepts/storage/storage-classes/#volume-binding-mode).
130+
Pods are scheduled. This can be accomplished by setting the
131+
[Volume Binding Mode](/docs/concepts/storage/storage-classes/#volume-binding-mode).
135132

136133

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -297,18 +297,18 @@ the following types of volumes:
297297
* {{< glossary_tooltip text="csi" term_id="csi" >}}
298298
* flexVolume (deprecated)
299299
* gcePersistentDisk
300-
* glusterfs
300+
* glusterfs (deprecated)
301301
* rbd
302302
* portworxVolume
303303

304304
You can only expand a PVC if its storage class's `allowVolumeExpansion` field is set to true.
305305

306-
``` yaml
306+
```yaml
307307
apiVersion: storage.k8s.io/v1
308308
kind: StorageClass
309309
metadata:
310-
name: gluster-vol-default
311-
provisioner: kubernetes.io/glusterfs
310+
name: example-vol-default
311+
provisioner: vendor-name.example/magicstorage
312312
parameters:
313313
resturl: "http://192.168.10.100:8080"
314314
restuser: ""
@@ -616,7 +616,7 @@ The following volume types support mount options:
616616
* `cephfs`
617617
* `cinder` (**deprecated** in v1.18)
618618
* `gcePersistentDisk`
619-
* `glusterfs`
619+
* `glusterfs` (**deprecated** in v1.25)
620620
* `iscsi`
621621
* `nfs`
622622
* `rbd`

content/en/docs/concepts/storage/storage-classes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ using `allowedTopologies`.
338338
[allowedTopologies](#allowed-topologies)
339339
{{< /note >}}
340340

341-
### Glusterfs
341+
### Glusterfs (deprecated) {#glusterfs}
342342

343343
```yaml
344344
apiVersion: storage.k8s.io/v1

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

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -335,12 +335,20 @@ Some uses for an `emptyDir` are:
335335
* holding files that a content-manager container fetches while a webserver
336336
container serves the data
337337

338-
Depending on your environment, `emptyDir` volumes are stored on whatever medium that backs the
339-
node such as disk or SSD, or network storage. However, if you set the `emptyDir.medium` field
340-
to `"Memory"`, Kubernetes mounts a tmpfs (RAM-backed filesystem) for you instead.
341-
While tmpfs is very fast, be aware that unlike disks, tmpfs is cleared on
342-
node reboot and any files you write count against your container's
343-
memory limit.
338+
The `emptyDir.medium` field controls where `emptyDir` volumes are stored. By
339+
default `emptyDir` volumes are stored on whatever medium that backs the node
340+
such as disk, SSD, or network storage, depending on your environment. If you set
341+
the `emptyDir.medium` field to `"Memory"`, Kubernetes mounts a tmpfs (RAM-backed
342+
filesystem) for you instead. While tmpfs is very fast, be aware that unlike
343+
disks, tmpfs is cleared on node reboot and any files you write count against
344+
your container's memory limit.
345+
346+
347+
A size limit can be specified for the default medium, which limits the capacity
348+
of the `emptyDir` volume. The storage is allocated from [node ephemeral
349+
storage](docs/concepts/configuration/manage-resources-containers/#setting-requests-and-limits-for-local-ephemeral-storage).
350+
If that is filled up from another source (for example, log files or image
351+
overlays), the `emptyDir` may run out of capacity before this limit.
344352

345353
{{< note >}}
346354
If the `SizeMemoryBackedVolumes` [feature gate](/docs/reference/command-line-tools-reference/feature-gates/) is enabled,
@@ -364,7 +372,8 @@ spec:
364372
name: cache-volume
365373
volumes:
366374
- name: cache-volume
367-
emptyDir: {}
375+
emptyDir:
376+
sizeLimit: 500Mi
368377
```
369378

370379
### fc (fibre channel) {#fc}
@@ -534,15 +543,15 @@ spec:
534543
revision: "22f1d8406d464b0c0874075539c1f2e96c253775"
535544
```
536545

537-
### glusterfs (deprecated)
546+
### glusterfs (deprecated) {#glusterfs}
538547

539548
{{< feature-state for_k8s_version="v1.25" state="deprecated" >}}
540549

541550
A `glusterfs` volume allows a [Glusterfs](https://www.gluster.org) (an open
542551
source networked filesystem) volume to be mounted into your Pod. Unlike
543552
`emptyDir`, which is erased when a Pod is removed, the contents of a
544553
`glusterfs` volume are preserved and the volume is merely unmounted. This
545-
means that a glusterfs volume can be pre-populated with data, and that data can
554+
means that a `glusterfs` volume can be pre-populated with data, and that data can
546555
be shared between pods. GlusterFS can be mounted by multiple writers
547556
simultaneously.
548557

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "Workloads"
3-
weight: 50
3+
weight: 55
44
description: >
55
Understand Pods, the smallest deployable compute object in Kubernetes, and the higher-level abstractions that help you to run them.
66
no_list: true

0 commit comments

Comments
 (0)