Skip to content

Commit 4d48a55

Browse files
Merge remote-tracking branch 'upstream/main' into update-docs-reference-kubectl-cheatsheet-md
2 parents f65df97 + 920823d commit 4d48a55

File tree

502 files changed

+73656
-16607
lines changed

Some content is hidden

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

502 files changed

+73656
-16607
lines changed

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ CONTAINER_ENGINE ?= docker
99
IMAGE_REGISTRY ?= gcr.io/k8s-staging-sig-docs
1010
IMAGE_VERSION=$(shell scripts/hash-files.sh Dockerfile Makefile | cut -c 1-12)
1111
CONTAINER_IMAGE = $(IMAGE_REGISTRY)/k8s-website-hugo:v$(HUGO_VERSION)-$(IMAGE_VERSION)
12-
CONTAINER_RUN = "$(CONTAINER_ENGINE)" run --rm --interactive --tty --volume "$(CURDIR):/src"
12+
# Mount read-only to allow use with tools like Podman in SELinux mode
13+
# Container targets don't need to write into /src
14+
CONTAINER_RUN = "$(CONTAINER_ENGINE)" run --rm --interactive --tty --volume "$(CURDIR):/src:ro,Z"
1315

1416
CCRED=\033[0;31m
1517
CCEND=\033[0m

README-zh.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ This repository contains the assets required to build the [Kubernetes website an
2222
<!--
2323
## Using this repository
2424
25-
You can run the website locally using Hugo (Extended version), or you can run it in a container runtime. We strongly recommend using the container runtime, as it gives deployment consistency with the live website.
25+
You can run the website locally using [Hugo (Extended version)](https://gohugo.io/), or you can run it in a container runtime. We strongly recommend using the container runtime, as it gives deployment consistency with the live website.
2626
-->
2727
## 使用这个仓库
2828

29-
可以使用 Hugo(扩展版)在本地运行网站,也可以在容器中运行它。强烈建议使用容器,因为这样可以和在线网站的部署保持一致。
29+
可以使用 [Hugo(扩展版)](https://gohugo.io/)在本地运行网站,也可以在容器中运行它。强烈建议使用容器,因为这样可以和在线网站的部署保持一致。
3030

3131
<!--
3232
## Prerequisites
@@ -150,11 +150,11 @@ This will start the local Hugo server on port 1313. Open up your browser to <htt
150150
## 构建 API 参考页面
151151

152152
<!--
153-
The API reference pages located in `content/en/docs/reference/kubernetes-api` are built from the Swagger specification, using <https://github.com/kubernetes-sigs/reference-docs/tree/master/gen-resourcesdocs>.
153+
The API reference pages located in `content/en/docs/reference/kubernetes-api` are built from the Swagger specification, also known as OpenAPI specification, using <https://github.com/kubernetes-sigs/reference-docs/tree/master/gen-resourcesdocs>.
154154
155155
To update the reference pages for a new Kubernetes release follow these steps:
156156
-->
157-
位于 `content/en/docs/reference/kubernetes-api` 的 API 参考页面是根据 Swagger 规范构建的,使用 <https://github.com/kubernetes-sigs/reference-docs/tree/master/gen-resourcesdocs>
157+
位于 `content/en/docs/reference/kubernetes-api` 的 API 参考页面是使用 <https://github.com/kubernetes-sigs/reference-docs/tree/master/gen-resourcesdocs> 根据 Swagger 规范(也称为 OpenAPI 规范)构建的
158158

159159
要更新 Kubernetes 新版本的参考页面,请执行以下步骤:
160160

api-ref-assets/api/swagger.json

Lines changed: 11717 additions & 8245 deletions
Large diffs are not rendered by default.

api-ref-assets/config/fields.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@
9999
- initContainerStatuses
100100
- containerStatuses
101101
- ephemeralContainerStatuses
102+
- resize
102103

103104
- definition: io.k8s.api.core.v1.Container
104105
field_categories:
@@ -127,6 +128,7 @@
127128
- name: Resources
128129
fields:
129130
- resources
131+
- resizePolicy
130132
- name: Lifecycle
131133
fields:
132134
- lifecycle
@@ -219,6 +221,9 @@
219221
fields:
220222
- volumeMounts
221223
- volumeDevices
224+
- name: Resources
225+
fields:
226+
- resizePolicy
222227
- name: Lifecycle
223228
fields:
224229
- terminationMessagePath

api-ref-assets/config/toc.yaml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,18 +66,18 @@ parts:
6666
- name: PriorityClass
6767
group: scheduling.k8s.io
6868
version: v1
69-
- name: PodScheduling
69+
- name: PodSchedulingContext
7070
group: resource.k8s.io
71-
version: v1alpha1
71+
version: v1alpha2
7272
- name: ResourceClaim
7373
group: resource.k8s.io
74-
version: v1alpha1
74+
version: v1alpha2
7575
- name: ResourceClaimTemplate
7676
group: resource.k8s.io
77-
version: v1alpha1
77+
version: v1alpha2
7878
- name: ResourceClass
7979
group: resource.k8s.io
80-
version: v1alpha1
80+
version: v1alpha2
8181
- name: Service Resources
8282
chapters:
8383
- name: Service
@@ -148,6 +148,12 @@ parts:
148148
- name: CertificateSigningRequest
149149
group: certificates.k8s.io
150150
version: v1
151+
- name: ClusterTrustBundle
152+
group: certificates.k8s.io
153+
version: v1alpha1
154+
- name: SelfSubjectReview
155+
group: authentication.k8s.io
156+
version: v1beta1
151157
- name: Authorization Resources
152158
chapters:
153159
- name: LocalSubjectAccessReview
@@ -191,6 +197,9 @@ parts:
191197
- name: PodDisruptionBudget
192198
group: policy
193199
version: v1
200+
- name: IPAddress
201+
group: networking.k8s.io
202+
version: v1alpha1
194203
- name: Extend Resources
195204
chapters:
196205
- name: CustomResourceDefinition

assets/scss/_base.scss

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,16 @@ main {
102102
}
103103
}
104104

105+
::selection {
106+
background: #326ce5;
107+
color: white;
108+
}
109+
110+
::-moz-selection {
111+
background: #326ce5;
112+
color: white;
113+
}
114+
105115
// HEADER
106116

107117
#hamburger {
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
title: Resourcen-Verwaltung für Pods und Container
3+
content_type: concept
4+
weight: 40
5+
feature:
6+
title: Automatisches Bin Packing
7+
description: >
8+
Container können je nach Systemanforderungen auf spezifischen Nodes ausgeführt werden. Somit kann eine effiziente Nutzung von Ressourcen erreicht werden.
9+
---
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
title: Secrets
3+
content_type: concept
4+
feature:
5+
title: Verwaltung von Secrets und Konfigurationen
6+
description: >
7+
Deploye und aktualisiere Secrets sowie Anwendungskonfigurationen, ohne ein Image neu zu bauen oder Secrets preiszugeben.
8+
weight: 30
9+
---
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
---
22
title: "Kubernetes erweitern"
33
weight: 110
4+
feature:
5+
title: Für Erweiterungen entworfen
6+
description: >
7+
Kubernetes kann ohne Änderungen am Upstream-Quelltext erweitert werden.
48
---
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
title: IPv4/IPv6 dual-stack
3+
description: >-
4+
Kubernetes erlaubt Netzwerkkonfigurationen mit IPv4 oder IPv6 (Single Stack).
5+
Im Dual-Stack-Betrieb kann IPv4 im Verbund mit IPv6 verwendet werden.
6+
7+
feature:
8+
title: IPv4/IPv6 Dual-Stack
9+
description: >
10+
Pods und Dienste können gleichzeitig IPv4- und IPv6-Adressen verwenden.
11+
content_type: concept
12+
reviewers:
13+
- lachie83
14+
- khenidak
15+
- aramase
16+
- bridgetkromhout
17+
weight: 90
18+
---

0 commit comments

Comments
 (0)