Skip to content

Commit

Permalink
Merge branch 'kubernetes:main' into juliafmorgado-kops
Browse files Browse the repository at this point in the history
  • Loading branch information
juliafmorgado authored Nov 8, 2022
2 parents 67e39d3 + ef08cba commit 507cf1d
Show file tree
Hide file tree
Showing 83 changed files with 3,203 additions and 1,056 deletions.
2 changes: 2 additions & 0 deletions OWNERS_ALIASES
Original file line number Diff line number Diff line change
Expand Up @@ -216,12 +216,14 @@ aliases:
- aisonaku
- potapy4
- dianaabv
- shurup
sig-docs-ru-reviews: # PR reviews for Russian content
- Arhell
- msheldyakov
- aisonaku
- potapy4
- dianaabv
- shurup
sig-docs-pl-owners: # Admins for Polish content
- mfilocha
- nvtkaszpir
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ for the past 2 years. I describe Kluctl as "The missing glue to put together
large Kubernetes deployments, composed of multiple smaller parts
(Helm/Kustomize/...) in a manageable and unified way."

To get a basic understanding of Kluctl, I suggest to visit the [kluctl.io](https://kluctlio)
To get a basic understanding of Kluctl, I suggest to visit the [kluctl.io](https://kluctl.io)
website and read through the documentation and tutorials, for example the
[microservices demo tutorial](https://kluctl.io/docs/guides/tutorials/microservices-demo/).
As an alternative, you can watch [Hands-on Introduction to kluctl](https://www.youtube.com/watch?v=9LoYLjDjOdg)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,8 @@ or 400 megabytes (`400M`).
In the following example, the Pod has two containers. Each container has a request of
2GiB of local ephemeral storage. Each container has a limit of 4GiB of local ephemeral
storage. Therefore, the Pod has a request of 4GiB of local ephemeral storage, and
a limit of 8GiB of local ephemeral storage.
a limit of 8GiB of local ephemeral storage. 500Mi of that limit could be
consumed by the `emptyDir` volume.

```yaml
apiVersion: v1
Expand Down Expand Up @@ -377,7 +378,8 @@ spec:
mountPath: "/tmp"
volumes:
- name: ephemeral
emptyDir: {}
emptyDir:
sizeLimit: 500Mi
```

### How Pods with ephemeral-storage requests are scheduled
Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/concepts/scheduling-eviction/_index.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: "Scheduling, Preemption and Eviction"
weight: 90
weight: 95
content_type: concept
description: >
In Kubernetes, scheduling refers to making sure that Pods are matched to Nodes
Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/concepts/security/_index.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: "Security"
weight: 81
weight: 85
description: >
Concepts for keeping your cloud-native workload secure.
---
11 changes: 4 additions & 7 deletions content/en/docs/concepts/storage/dynamic-provisioning.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ to represent them in Kubernetes. The dynamic provisioning feature eliminates
the need for cluster administrators to pre-provision storage. Instead, it
automatically provisions storage when it is requested by users.




<!-- body -->

## Background
Expand Down Expand Up @@ -116,7 +113,7 @@ can enable this behavior by:
is enabled on the API server.

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

## Topology Awareness

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


10 changes: 5 additions & 5 deletions content/en/docs/concepts/storage/persistent-volumes.md
Original file line number Diff line number Diff line change
Expand Up @@ -297,18 +297,18 @@ the following types of volumes:
* {{< glossary_tooltip text="csi" term_id="csi" >}}
* flexVolume (deprecated)
* gcePersistentDisk
* glusterfs
* glusterfs (deprecated)
* rbd
* portworxVolume

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

``` yaml
```yaml
apiVersion: storage.k8s.io/v1
kind: StorageClass
metadata:
name: gluster-vol-default
provisioner: kubernetes.io/glusterfs
name: example-vol-default
provisioner: vendor-name.example/magicstorage
parameters:
resturl: "http://192.168.10.100:8080"
restuser: ""
Expand Down Expand Up @@ -616,7 +616,7 @@ The following volume types support mount options:
* `cephfs`
* `cinder` (**deprecated** in v1.18)
* `gcePersistentDisk`
* `glusterfs`
* `glusterfs` (**deprecated** in v1.25)
* `iscsi`
* `nfs`
* `rbd`
Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/concepts/storage/storage-classes.md
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ using `allowedTopologies`.
[allowedTopologies](#allowed-topologies)
{{< /note >}}

### Glusterfs
### Glusterfs (deprecated) {#glusterfs}

```yaml
apiVersion: storage.k8s.io/v1
Expand Down
27 changes: 18 additions & 9 deletions content/en/docs/concepts/storage/volumes.md
Original file line number Diff line number Diff line change
Expand Up @@ -335,12 +335,20 @@ Some uses for an `emptyDir` are:
* holding files that a content-manager container fetches while a webserver
container serves the data

Depending on your environment, `emptyDir` volumes are stored on whatever medium that backs the
node such as disk or SSD, or network storage. However, if you set the `emptyDir.medium` field
to `"Memory"`, Kubernetes mounts a tmpfs (RAM-backed filesystem) for you instead.
While tmpfs is very fast, be aware that unlike disks, tmpfs is cleared on
node reboot and any files you write count against your container's
memory limit.
The `emptyDir.medium` field controls where `emptyDir` volumes are stored. By
default `emptyDir` volumes are stored on whatever medium that backs the node
such as disk, SSD, or network storage, depending on your environment. If you set
the `emptyDir.medium` field to `"Memory"`, Kubernetes mounts a tmpfs (RAM-backed
filesystem) for you instead. While tmpfs is very fast, be aware that unlike
disks, tmpfs is cleared on node reboot and any files you write count against
your container's memory limit.


A size limit can be specified for the default medium, which limits the capacity
of the `emptyDir` volume. The storage is allocated from [node ephemeral
storage](docs/concepts/configuration/manage-resources-containers/#setting-requests-and-limits-for-local-ephemeral-storage).
If that is filled up from another source (for example, log files or image
overlays), the `emptyDir` may run out of capacity before this limit.

{{< note >}}
If the `SizeMemoryBackedVolumes` [feature gate](/docs/reference/command-line-tools-reference/feature-gates/) is enabled,
Expand All @@ -364,7 +372,8 @@ spec:
name: cache-volume
volumes:
- name: cache-volume
emptyDir: {}
emptyDir:
sizeLimit: 500Mi
```

### fc (fibre channel) {#fc}
Expand Down Expand Up @@ -534,15 +543,15 @@ spec:
revision: "22f1d8406d464b0c0874075539c1f2e96c253775"
```

### glusterfs (deprecated)
### glusterfs (deprecated) {#glusterfs}

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

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

Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/concepts/workloads/_index.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: "Workloads"
weight: 50
weight: 55
description: >
Understand Pods, the smallest deployable compute object in Kubernetes, and the higher-level abstractions that help you to run them.
no_list: true
Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/reference/access-authn-authz/_index.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: API Access Control
weight: 15
weight: 30
no_list: true
---

Expand Down
Loading

0 comments on commit 507cf1d

Please sign in to comment.