Skip to content

Commit aba5108

Browse files
authored
Merge pull request #45049 from Vyom-Yadav/merged-main-dev-1.30
Merge main branch into dev-1.30
2 parents 06c921f + b7581ac commit aba5108

File tree

8 files changed

+259
-19
lines changed

8 files changed

+259
-19
lines changed

content/en/docs/reference/kubectl/quick-reference.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,11 @@ Kubernetes manifests can be defined in YAML or JSON. The file extension `.yaml`,
112112
`.yml`, and `.json` can be used.
113113

114114
```bash
115-
kubectl apply -f ./my-manifest.yaml # create resource(s)
116-
kubectl apply -f ./my1.yaml -f ./my2.yaml # create from multiple files
117-
kubectl apply -f ./dir # create resource(s) in all manifest files in dir
118-
kubectl apply -f https://git.io/vPieo # create resource(s) from url
119-
kubectl create deployment nginx --image=nginx # start a single instance of nginx
115+
kubectl apply -f ./my-manifest.yaml # create resource(s)
116+
kubectl apply -f ./my1.yaml -f ./my2.yaml # create from multiple files
117+
kubectl apply -f ./dir # create resource(s) in all manifest files in dir
118+
kubectl apply -f https://example.com/manifest.yaml # create resource(s) from url (Note: this is an example domain and does not contain a valid manifest)
119+
kubectl create deployment nginx --image=nginx # start a single instance of nginx
120120

121121
# create a Job which prints "Hello World"
122122
kubectl create job hello --image=busybox:1.28 -- echo "Hello World"

content/en/docs/setup/production-environment/tools/kubeadm/create-cluster-kubeadm.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,10 @@ support [Network Policy](/docs/concepts/services-networking/network-policies/).
333333
See a list of add-ons that implement the
334334
[Kubernetes networking model](/docs/concepts/cluster-administration/networking/#how-to-implement-the-kubernetes-network-model).
335335

336-
You can install a Pod network add-on with the following command on the
336+
337+
Please refer to the [Installing Addons](/docs/concepts/cluster-administration/addons/#networking-and-network-policy)
338+
page for a non-exhaustive list of networking addons supported by Kubernetes.
339+
You can install a Pod network add-on with the following command on the
337340
control-plane node or a node that has the kubeconfig credentials:
338341

339342
```bash
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
---
22
title: "クラスターのアーキテクチャ"
33
weight: 30
4+
description: >
5+
Kubernetesの背後にあるアーキテクチャのコンセプト。
46
---
7+
8+
{{< figure src="/images/docs/kubernetes-cluster-architecture.svg" alt="Components of Kubernetes" caption="Kubernetesクラスターのアーキテクチャ" class="diagram-large" >}}

content/ru/docs/concepts/workloads/controllers/cron-jobs.md

Lines changed: 233 additions & 0 deletions
Large diffs are not rendered by default.

content/zh-cn/docs/concepts/security/rbac-good-practices.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ Kubernetes 默认提供访问权限并非是每个集群都需要的。
151151
It is vital to periodically review the Kubernetes RBAC settings for redundant entries and
152152
possible privilege escalations.
153153
If an attacker is able to create a user account with the same name as a deleted user,
154-
they can automatically inherit all the rights of the deleted user, especially the
154+
they can automatically inherit all the rights of the deleted user, specially the
155155
rights assigned to that user.
156156
-->
157157
### 定期检查 {#periodic-review}
@@ -260,8 +260,8 @@ You should only allow access to create PersistentVolume objects for:
260260
你应该只允许以下实体具有创建 PersistentVolume 对象的访问权限:
261261

262262
<!--
263-
- users (cluster operators) that need this access for their work, and who you trust,
264-
- the Kubernetes control plane components which creates PersistentVolumes based on PersistentVolumeClaims
263+
- Users (cluster operators) that need this access for their work, and who you trust,
264+
- The Kubernetes control plane components which creates PersistentVolumes based on PersistentVolumeClaims
265265
that are configured for automatic provisioning.
266266
This is usually setup by the Kubernetes provider or by the operator when installing a CSI driver.
267267
-->

content/zh-cn/docs/reference/kubectl/quick-reference.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -219,11 +219,11 @@ Kubernetes 配置可以用 YAML 或 JSON 定义。可以使用的文件扩展名
219219

220220
<!--
221221
```bash
222-
kubectl apply -f ./my-manifest.yaml # create resource(s)
223-
kubectl apply -f ./my1.yaml -f ./my2.yaml # create from multiple files
224-
kubectl apply -f ./dir # create resource(s) in all manifest files in dir
225-
kubectl apply -f https://git.io/vPieo # create resource(s) from url
226-
kubectl create deployment nginx --image=nginx # start a single instance of nginx
222+
kubectl apply -f ./my-manifest.yaml # create resource(s)
223+
kubectl apply -f ./my1.yaml -f ./my2.yaml # create from multiple files
224+
kubectl apply -f ./dir # create resource(s) in all manifest files in dir
225+
kubectl apply -f https://example.com/manifest.yaml # create resource(s) from url (Note: this is an example domain and does not contain a valid manifest)
226+
kubectl create deployment nginx --image=nginx # start a single instance of nginx
227227
228228
# create a Job which prints "Hello World"
229229
kubectl create job hello --image=busybox:1.28 -- echo "Hello World"
@@ -274,11 +274,11 @@ EOF
274274
```
275275
-->
276276
```bash
277-
kubectl apply -f ./my-manifest.yaml # 创建资源
278-
kubectl apply -f ./my1.yaml -f ./my2.yaml # 使用多个文件创建
279-
kubectl apply -f ./dir # 基于目录下的所有清单文件创建资源
280-
kubectl apply -f https://git.io/vPieo # 从 URL 中创建资源
281-
kubectl create deployment nginx --image=nginx # 启动单实例 nginx
277+
kubectl apply -f ./my-manifest.yaml # 创建资源
278+
kubectl apply -f ./my1.yaml -f ./my2.yaml # 使用多个文件创建
279+
kubectl apply -f ./dir # 基于目录下的所有清单文件创建资源
280+
kubectl apply -f https://example.com/manifest.yaml # 从 URL 中创建资源(注意:这是一个示例域名,不包含有效的清单)
281+
kubectl create deployment nginx --image=nginx # 启动单实例 nginx
282282

283283
# 创建一个打印 “Hello World” 的 Job
284284
kubectl create job hello --image=busybox:1.28 -- echo "Hello World"

0 commit comments

Comments
 (0)