Skip to content

Commit 49365c2

Browse files
authored
Merge branch 'kubernetes:main' into hi-running-multiple-zone
2 parents 0f868f9 + 9c59603 commit 49365c2

File tree

21 files changed

+141
-146
lines changed

21 files changed

+141
-146
lines changed

OWNERS_ALIASES

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
aliases:
22
sig-docs-blog-owners: # Approvers for blog content
3-
- onlydole
43
- mrbobbytables
5-
- sftim
64
- nate-double-u
5+
- onlydole
6+
- sftim
77
sig-docs-blog-reviewers: # Reviewers for blog content
88
- mrbobbytables
9+
- nate-double-u
910
- onlydole
1011
- sftim
11-
- nate-double-u
1212
sig-docs-localization-owners: # Admins for localization content
1313
- a-mccarthy
14-
- bradtopol
1514
- divya-mohan0209
1615
- jimangel
1716
- kbhawkey
@@ -33,7 +32,6 @@ aliases:
3332
- bradtopol
3433
- divya-mohan0209
3534
- jimangel
36-
- jlbutler
3735
- kbhawkey
3836
- krol3
3937
- natalisucks
@@ -44,15 +42,13 @@ aliases:
4442
- tengqm
4543
sig-docs-en-reviews: # PR reviews for English content
4644
- bradtopol
47-
- daminisatya
4845
- divya-mohan0209
4946
- jimangel
5047
- kbhawkey
5148
- mehabhalodiya
5249
- natalisucks
5350
- nate-double-u
5451
- onlydole
55-
- rajeshdeshpande02
5652
- reylejano
5753
- sftim
5854
- shannonxtreme

SECURITY_CONTACTS

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,9 @@
1111
# INSTRUCTIONS AT https://kubernetes.io/security/
1212

1313
divya-mohan0209
14-
jimangel
14+
reylejano
1515
sftim
16+
tengqm
17+
onlydole
18+
kbhawkey
19+
natalisucks

content/en/blog/_posts/2021-04-06-PodSecurityPolicy-Past-Present-and-Future.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@ title: "PodSecurityPolicy Deprecation: Past, Present, and Future"
44
date: 2021-04-06
55
slug: podsecuritypolicy-deprecation-past-present-and-future
66
---
7-
87
**Author:** Tabitha Sable (Kubernetes SIG Security)
98

9+
{{% pageinfo color="primary" %}}
10+
**Update:** *With the release of Kubernetes v1.25, PodSecurityPolicy has been removed.* *You can read more information about the removal of PodSecurityPolicy in the [Kubernetes 1.25 release notes](/blog/2022/08/23/kubernetes-v1-25-release/#pod-security-changes).*
11+
{{% /pageinfo %}}
12+
1013
PodSecurityPolicy (PSP) is being deprecated in Kubernetes 1.21, to be released later this week. This starts the countdown to its removal, but doesn’t change anything else. PodSecurityPolicy will continue to be fully functional for several more releases before being removed completely. In the meantime, we are developing a replacement for PSP that covers key use cases more easily and sustainably.
1114

1215
What are Pod Security Policies? Why did we need them? Why are they going away, and what’s next? How does this affect you? These key questions come to mind as we prepare to say goodbye to PSP, so let’s walk through them together. We’ll start with an overview of how features get removed from Kubernetes.

content/en/docs/concepts/policy/resource-quotas.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,18 @@ Resource quotas work like this:
3939
See the [walkthrough](/docs/tasks/administer-cluster/manage-resources/quota-memory-cpu-namespace/)
4040
for an example of how to avoid this problem.
4141

42+
{{< note >}}
43+
- For `cpu` and `memory` resources, ResourceQuotas enforce that **every**
44+
(new) pod in that namespace sets a limit for that resource.
45+
If you enforce a resource quota in a namespace for either `cpu` or `memory`,
46+
you, and other clients, **must** specify either `requests` or `limits` for that resource,
47+
for every new Pod you submit. If you don't, the control plane may reject admission
48+
for that Pod.
49+
- For other resources: ResourceQuota works and will ignore pods in the namespace without setting a limit or request for that resource. It means that you can create a new pod without limit/request ephemeral storage if the resource quota limits the ephemeral storage of this namespace.
50+
You can use a [LimitRange](/docs/concepts/policy/limit-range/) to automatically set
51+
a default request for these resources.
52+
{{< /note >}}
53+
4254
The name of a ResourceQuota object must be a valid
4355
[DNS subdomain name](/docs/concepts/overview/working-with-objects/names#dns-subdomain-names).
4456

content/en/docs/reference/access-authn-authz/certificate-signing-requests.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ The certificate value is in Base64-encoded format under `status.certificate`.
268268

269269
Export the issued certificate from the CertificateSigningRequest.
270270

271-
```
271+
```shell
272272
kubectl get csr myuser -o jsonpath='{.status.certificate}'| base64 -d > myuser.crt
273273
```
274274

@@ -295,20 +295,20 @@ The last step is to add this user into the kubeconfig file.
295295

296296
First, you need to add new credentials:
297297

298-
```
298+
```shell
299299
kubectl config set-credentials myuser --client-key=myuser.key --client-certificate=myuser.crt --embed-certs=true
300300

301301
```
302302

303303
Then, you need to add the context:
304304

305-
```
305+
```shell
306306
kubectl config set-context myuser --cluster=kubernetes --user=myuser
307307
```
308308

309309
To test it, change the context to `myuser`:
310310

311-
```
311+
```shell
312312
kubectl config use-context myuser
313313
```
314314

content/en/docs/reference/kubectl/cheatsheet.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ kubectl expose rc nginx --port=80 --target-port=8000
266266
kubectl get pod mypod -o yaml | sed 's/\(image: myimage\):.*$/\1:v4/' | kubectl replace -f -
267267

268268
kubectl label pods my-pod new-label=awesome # Add a Label
269+
kubectl label pods my-pod new-label- # Remove a label
269270
kubectl annotate pods my-pod icon-url=http://goo.gl/XXBTWq # Add an annotation
270271
kubectl autoscale deployment foo --min=2 --max=10 # Auto scale a deployment "foo"
271272
```

content/en/docs/tasks/run-application/horizontal-pod-autoscale.md

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,30 @@ horizontal pod autoscaling.
4747

4848
## How does a HorizontalPodAutoscaler work?
4949

50-
{{< figure src="/images/docs/horizontal-pod-autoscaler.svg" caption="HorizontalPodAutoscaler controls the scale of a Deployment and its ReplicaSet" class="diagram-medium">}}
50+
{{< mermaid >}}
51+
graph BT
52+
53+
hpa[Horizontal Pod Autoscaler] --> scale[Scale]
54+
55+
subgraph rc[RC / Deployment]
56+
scale
57+
end
58+
59+
scale -.-> pod1[Pod 1]
60+
scale -.-> pod2[Pod 2]
61+
scale -.-> pod3[Pod N]
62+
63+
classDef hpa fill:#D5A6BD,stroke:#1E1E1D,stroke-width:1px,color:#1E1E1D;
64+
classDef rc fill:#F9CB9C,stroke:#1E1E1D,stroke-width:1px,color:#1E1E1D;
65+
classDef scale fill:#B6D7A8,stroke:#1E1E1D,stroke-width:1px,color:#1E1E1D;
66+
classDef pod fill:#9FC5E8,stroke:#1E1E1D,stroke-width:1px,color:#1E1E1D;
67+
class hpa hpa;
68+
class rc rc;
69+
class scale scale;
70+
class pod1,pod2,pod3 pod
71+
{{< /mermaid >}}
72+
73+
Figure 1. HorizontalPodAutoscaler controls the scale of a Deployment and its ReplicaSet
5174

5275
Kubernetes implements horizontal pod autoscaling as a control loop that runs intermittently
5376
(it is not a continuous process). The interval is set by the

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ Au lieu de cela, un volume existant est redimensionné.
242242

243243
#### Redimensionnement de volume CSI
244244

245-
{{< feature-state for_k8s_version="v1.16" state="beta" >}}
245+
{{< feature-state for_k8s_version="v1.24" state="stable" >}}
246246

247247
La prise en charge du redimensionnement des volumes CSI est activée par défaut, mais elle nécessite également un pilote CSI spécifique pour prendre en charge le redimensionnement des volumes.
248248
Reportez-vous à la documentation du pilote CSI spécifique pour plus d'informations.
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
title: Interface de Armazenamento de Contêiner
3+
id: csi
4+
date: 2018-06-25
5+
full_link: /pt-br/docs/concepts/storage/volumes/#csi
6+
short_description: >
7+
A Interface de Armazenamento de Contêiner (_Container Storage Interface_, CSI) define um padrão de interface para expor sistemas de armazenamento a contêineres.
8+
9+
aka:
10+
tags:
11+
- storage
12+
---
13+
A Interface de Armazenamento de Contêiner (_Container Storage Interface_, CSI) define um padrão de interface para expor sistemas de armazenamento a contêineres.
14+
15+
<!--more-->
16+
17+
O CSI permite que os fornecedores criem plugins personalizados de armazenamento para o Kubernetes sem adicioná-los ao repositório Kubernetes (plugins fora da árvore).
18+
Para usar um driver CSI de um provedor de armazenamento, você deve primeiro [instalá-lo no seu cluster](https://kubernetes-csi.github.io/docs/deploying.html).
19+
Você poderá então criar uma {{< glossary_tooltip text="Classe de Armazenamento" term_id="storage-class" >}} que use esse driver CSI.
20+
21+
* [CSI na documentação do Kubernetes](/pt-br/docs/concepts/storage/volumes/#csi)
22+
* [Lista de drivers CSI disponíveis](https://kubernetes-csi.github.io/docs/drivers.html)

content/zh-cn/docs/concepts/architecture/cgroups.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ constrain resources that are allocated to processes.
1717
1818
The {{< glossary_tooltip text="kubelet" term_id="kubelet" >}} and the
1919
underlying container runtime need to interface with cgroups to enforce
20-
[resource mangement for pods and containers](/docs/concepts/configuration/manage-resources-containers/) which
20+
[resource management for pods and containers](/docs/concepts/configuration/manage-resources-containers/) which
2121
includes cpu/memory requests and limits for containerized workloads.
2222
2323
There are two versions of cgroups in Linux: cgroup v1 and cgroup v2. cgroup v2 is
@@ -204,7 +204,7 @@ cgroup v2 使用一个与 cgroup v1 不同的 API,因此如果有任何应用
204204
<!--
205205
## Identify the cgroup version on Linux Nodes {#check-cgroup-version}
206206
207-
The cgroup version depends on on the Linux distribution being used and the
207+
The cgroup version depends on the Linux distribution being used and the
208208
default cgroup version configured on the OS. To check which cgroup version your
209209
distribution uses, run the `stat -fc %T /sys/fs/cgroup/` command on
210210
the node:

0 commit comments

Comments
 (0)