Skip to content

Commit dd0aee9

Browse files
authored
[zh-cn] sync task files of task-3 (#40052)
* [zh-cn] sync task files of task-3 [zh-cn] sync task files of task-3 * [zh-cn] sync task files of task-3
1 parent 8eb8b5b commit dd0aee9

File tree

5 files changed

+45
-44
lines changed

5 files changed

+45
-44
lines changed

content/zh-cn/docs/tasks/configure-pod-container/configure-gmsa.md

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
title: 为 Windows Pod 和容器配置 GMSA
33
content_type: task
4-
weight: 20
4+
weight: 30
55
---
66
<!--
77
title: Configure GMSA for Windows Pods and containers
88
content_type: task
9-
weight: 20
9+
weight: 30
1010
-->
1111
<!-- overview -->
1212

@@ -55,6 +55,7 @@ Next, install the CRD with `kubectl apply -f gmsa-crd.yaml`
5555

5656
<!--
5757
### Install webhooks to validate GMSA users
58+
5859
Two webhooks need to be configured on the Kubernetes cluster to populate and validate GMSA credential spec references at the Pod or container level:
5960
6061
1. A mutating webhook that expands references to GMSAs (by name from a Pod specification) into the full credential spec in JSON form within the Pod spec.
@@ -79,7 +80,7 @@ Installing the above webhooks and associated objects require the steps below:
7980
8081
1. Install a secret with the certificate from above.
8182
82-
1. Create a deployment for the core webhook logic.
83+
1. Create a deployment for the core webhook logic.
8384
8485
1. Create the validating and mutating webhook configurations referring to the deployment.
8586
-->
@@ -94,7 +95,7 @@ Installing the above webhooks and associated objects require the steps below:
9495
1. 创建引用该 Deployment 的 Validating Webhook 和 Mutating Webhook 配置
9596

9697
<!--
97-
A [script](https://github.com/kubernetes-sigs/windows-gmsa/blob/master/admission-webhook/deploy/deploy-gmsa-webhook.sh) can be used to deploy and configure the GMSA webhooks and associated objects mentioned above. The script can be run with a `-dry-run=server` option to allow you to review the changes that would be made to your cluster.
98+
A [script](https://github.com/kubernetes-sigs/windows-gmsa/blob/master/admission-webhook/deploy/deploy-gmsa-webhook.sh) can be used to deploy and configure the GMSA webhooks and associated objects mentioned above. The script can be run with a ```--dry-run=server``` option to allow you to review the changes that would be made to your cluster.
9899
99100
The [YAML template](https://github.com/kubernetes-sigs/windows-gmsa/blob/master/admission-webhook/deploy/gmsa-webhook.yml.tpl) used by the script may also be used to deploy the webhooks and associated objects manually (with appropriate substitutions for the parameters)
100101
-->
@@ -142,7 +143,7 @@ Following are the steps for generating a GMSA credential spec YAML manually in J
142143
143144
1. Create a credential spec in JSON format using `New-CredentialSpec`. To create a GMSA credential spec named WebApp1, invoke `New-CredentialSpec -Name WebApp1 -AccountName WebApp1 -Domain $(Get-ADDomain -Current LocalComputer)`
144145
145-
1. Use `Get-CredentialSpec` to show the path of the JSON file.
146+
1. Use `Get-CredentialSpec` to show the path of the JSON file.
146147
147148
1. Convert the credspec file from JSON to YAML format and apply the necessary header fields `apiVersion`, `kind`, `metadata` and `credspec` to make it a GMSACredentialSpec custom resource that can be configured in Kubernetes.
148149
-->
@@ -258,6 +259,7 @@ rules:
258259

259260
<!--
260261
## Assign role to service accounts to use specific GMSA credspecs
262+
261263
A service account (that Pods will be configured with) needs to be bound to the cluster role create above. This authorizes the service account to use the desired GMSA credential spec resource. The following shows the default service account being bound to a cluster role `webapp1-role` to use `gmsa-WebApp1` credential spec resource created above.
262264
-->
263265
## 将角色指派给要使用特定 GMSA 凭据规约的服务账号
@@ -285,6 +287,7 @@ roleRef:
285287

286288
<!--
287289
## Configure GMSA credential spec reference in Pod spec
290+
288291
The Pod spec field `securityContext.windowsOptions.gmsaCredentialSpecName` is used to specify references to desired GMSA credential spec custom resources in Pod specs. This configures all containers in the Pod spec to use the specified GMSA. A sample Pod spec with the annotation populated to refer to `gmsa-WebApp1`:
289292
-->
290293
## 在 Pod 规约中配置 GMSA 凭据规约引用
@@ -380,7 +383,11 @@ As Pod specs with GMSA fields populated (as described above) are applied in a cl
380383
1. 容器运行时为每个 Windows 容器配置所指定的 GMSA 凭据规约,这样容器就可以以
381384
活动目录中该 GMSA 所代表的身份来执行操作,使用该身份来访问域中的服务。
382385

383-
## 使用主机名或 FQDN 对网络共享进行身份验证
386+
<!--
387+
## Authenticating to network shares using hostname or FQDN
388+
-->
389+
## 使用主机名或 FQDN 对网络共享进行身份验证
390+
384391
<!--
385392
If you are experiencing issues connecting to SMB shares from Pods using hostname or FQDN, but are able to access the shares via their IPv4 address then make sure the following registry key is set on the Windows nodes.
386393
-->
@@ -512,4 +519,3 @@ If you add the `lifecycle` section show above to your Pod spec, the Pod will exe
512519
如果你向你的 Pod 规约中添加如上所示的 `lifecycle` 节,则 Pod 会自动执行所
513520
列举的命令来重启 `netlogon` 服务,直到 `nltest.exe /query`
514521
命令返回时没有错误信息。
515-

content/zh-cn/docs/tasks/configure-pod-container/configure-projected-volume-storage.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: 配置 Pod 使用投射卷作存储
33
content_type: task
4-
weight: 70
4+
weight: 100
55
---
66

77
<!--
@@ -10,7 +10,7 @@ reviewers:
1010
- pmorie
1111
title: Configure a Pod to Use a Projected Volume for Storage
1212
content_type: task
13-
weight: 70
13+
weight: 100
1414
-->
1515

1616
<!-- overview -->
@@ -39,9 +39,7 @@ and `serviceAccountToken` volumes can be projected.
3939
<!--
4040
## Configure a projected volume for a pod
4141
42-
In this exercise, you create username and password {{< glossary_tooltip text="Secrets" term_id="secret" >}} from local files.
43-
You then create a Pod that runs one container, using a [`projected`](/docs/concepts/storage/volumes/#projected) Volume
44-
to mount the Secrets into the same shared directory.
42+
In this exercise, you create username and password {{< glossary_tooltip text="Secrets" term_id="secret" >}} from local files. You then create a Pod that runs one container, using a [`projected`](/docs/concepts/storage/volumes/#projected) Volume to mount the Secrets into the same shared directory.
4543
4644
Here is the configuration file for the Pod:
4745
-->
@@ -121,7 +119,7 @@ Delete the Pod and the Secrets:
121119
kubectl delete pod test-projected-volume
122120
kubectl delete secret user pass
123121
```
124-
122+
125123
## {{% heading "whatsnext" %}}
126124

127125
<!--

content/zh-cn/docs/tasks/configure-pod-container/configure-service-account.md

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: 为 Pod 配置服务账号
33
content_type: task
4-
weight: 90
4+
weight: 120
55
---
66
<!--
77
reviewers:
@@ -10,7 +10,7 @@ reviewers:
1010
- thockin
1111
title: Configure Service Accounts for Pods
1212
content_type: task
13-
weight: 90
13+
weight: 120
1414
-->
1515

1616
<!-- overview -->
@@ -134,7 +134,7 @@ automountServiceAccountToken: false
134134
...
135135
```
136136
<!--
137-
You can also opt out of automounting API credentials for a particular pod:
137+
You can also opt out of automounting API credentials for a particular Pod:
138138
-->
139139
你也可以选择不给特定 Pod 自动挂载 API 凭据:
140140

@@ -223,7 +223,7 @@ The output is similar to this:
223223
apiVersion: v1
224224
kind: ServiceAccount
225225
metadata:
226-
creationTimestamp: 2015-06-16T00:12:59Z
226+
creationTimestamp: 2019-06-16T00:12:34Z
227227
name: build-robot
228228
namespace: default
229229
resourceVersion: "272500"
@@ -235,7 +235,7 @@ You can use authorization plugins to
235235
[set permissions on service accounts](/docs/reference/access-authn-authz/rbac/#service-account-permissions).
236236
237237
To use a non-default service account, set the `spec.serviceAccountName`
238-
field of a pod to the name of the service account you wish to use.
238+
field of a Pod to the name of the ServiceAccount you wish to use.
239239
-->
240240
你可以使用鉴权插件来[设置服务账号的访问许可](/zh-cn/docs/reference/access-authn-authz/rbac/#service-account-permissions)。
241241

@@ -251,11 +251,11 @@ of a Pod that already exists.
251251

252252
{{< note >}}
253253
<!--
254-
The `spec.serviceAccount` field is a deprecated alias for `spec.serviceAccountName`.
254+
The `.spec.serviceAccount` field is a deprecated alias for `.spec.serviceAccountName`.
255255
If you want to remove the fields from a workload resource, set both fields to empty explicitly
256256
on the [pod template](/docs/concepts/workloads/pods#pod-templates).
257257
-->
258-
`spec.serviceAccount` 字段是 `spec.serviceAccountName` 的已弃用别名。
258+
`.spec.serviceAccount` 字段是 `.spec.serviceAccountName` 的已弃用别名。
259259
如果要从工作负载资源中删除这些字段,请在
260260
[Pod 模板](/zh-cn/docs/concepts/workloads/pods#pod-templates)上将这两个字段显式设置为空。
261261
{{< /note >}}
@@ -486,6 +486,11 @@ You can achieve the same outcome by editing the object manually:
486486
kubectl edit serviceaccount/default
487487
```
488488

489+
<!--
490+
The output of the `sa.yaml` file is similar to this:
491+
-->
492+
`sa.yaml` 文件的输出类似于:
493+
489494
<!--
490495
Your selected text editor will open with a configuration looking something like this:
491496
-->
@@ -551,7 +556,7 @@ myregistrykey
551556
```
552557
553558
<!--
554-
## Service Account Token Volume Projection
559+
## ServiceAccount token volume projection
555560
-->
556561
## 服务账号令牌卷投射 {#service-account-token-volume-projection}
557562
@@ -619,6 +624,7 @@ command line arguments to `kube-apiserver`:
619624
Kubernetes API 服务器当做合法的令牌。如果你指定了 `--service-account-issuer`
620625
参数,但沒有設置 `--api-audiences`,则控制面认为此参数的默认值为一个只有一个元素的列表,
621626
且该元素为令牌发放者的 URL。
627+
622628
{{< /note >}}
623629
624630
<!--
@@ -718,14 +724,14 @@ registered or accessible.
718724
{{< /note >}}
719725

720726
<!--
721-
When enabled, the Kubernetes API server provides an OpenID Provider
727+
When enabled, the Kubernetes API server publishes an OpenID Provider
722728
Configuration document via HTTP. The configuration document is published at
723729
`/.well-known/openid-configuration`.
724730
The OpenID Provider Configuration is sometimes referred to as the _discovery document_.
725731
The Kubernetes API server publishes the related
726732
JSON Web Key Set (JWKS), also via HTTP, at `/openid/v1/jwks`.
727733
-->
728-
当此特性被启用时,Kubernetes API 服务器会通过 HTTP 提供一个 OpenID 提供者配置文档。
734+
当此特性被启用时,Kubernetes API 服务器会通过 HTTP 发布一个 OpenID 提供者配置文档。
729735
该配置文档发布在 `/.well-known/openid-configuration` 路径。
730736
这里的 OpenID 提供者配置(OpenID Provider Configuration)有时候也被称作
731737
“发现文档(Discovery Document)”。
@@ -755,7 +761,7 @@ bind the role to `system:authenticated` or `system:unauthenticated` depending on
755761
security requirements and which external systems they intend to federate with.
756762
-->
757763
使用 {{< glossary_tooltip text="RBAC" term_id="rbac">}} 的集群都包含一个的默认
758-
RBAC ClusterRole, 名为 `system:service-account-issuer-discovery`
764+
RBAC ClusterRole, 名为 `system:service-account-issuer-discovery`
759765
默认的 RBAC ClusterRoleBinding 将此角色分配给 `system:serviceaccounts` 组,
760766
所有 ServiceAccount 隐式属于该组。这使得集群上运行的 Pod
761767
能够通过它们所挂载的服务账号令牌访问服务账号发现文档。
@@ -819,4 +825,3 @@ See also:
819825
- 关于 OIDC 发现的相关背景信息,阅读[服务账号签署密钥检索 KEP](https://github.com/kubernetes/enhancements/tree/master/keps/sig-auth/1393-oidc-discovery)
820826
这一 Kubernetes 增强提案
821827
- 阅读 [OIDC 发现规范](https://openid.net/specs/openid-connect-discovery-1_0.html)
822-

content/zh-cn/docs/tasks/configure-pod-container/pull-image-private-registry.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
22
title: 从私有仓库拉取镜像
33
content_type: task
4-
weight: 100
4+
weight: 130
55
---
66

77
<!--
88
title: Pull an Image from a Private Registry
99
content_type: task
10-
weight: 100
10+
weight: 130
1111
-->
1212

1313
<!-- overview -->

content/zh-cn/docs/tasks/configure-pod-container/quality-service-pod.md

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
22
title: 配置 Pod 的服务质量
33
content_type: task
4-
weight: 30
4+
weight: 60
55
---
66

77
<!--
88
title: Configure Quality of Service for Pods
99
content_type: task
10-
weight: 30
10+
weight: 60
1111
-->
1212

1313
<!-- overview -->
@@ -383,20 +383,6 @@ kubectl --namespace=qos-example get pod qos-demo-4 -o jsonpath='{ .status.qosCla
383383
Burstable
384384
```
385385

386-
<!--
387-
## Clean up
388-
-->
389-
## 清理 {#clean-up}
390-
391-
<!--
392-
Delete your Pod:
393-
-->
394-
删除 Pod:
395-
396-
```shell
397-
kubectl delete pod qos-demo-4 --namespace=qos-example
398-
```
399-
400386
<!--
401387
## Clean up
402388
@@ -428,12 +414,19 @@ kubectl delete namespace qos-example
428414
### For cluster administrators
429415
430416
* [Configure Default Memory Requests and Limits for a Namespace](/docs/tasks/administer-cluster/manage-resources/memory-default-namespace/)
417+
431418
* [Configure Default CPU Requests and Limits for a Namespace](/docs/tasks/administer-cluster/manage-resources/cpu-default-namespace/)
419+
432420
* [Configure Minimum and Maximum Memory Constraints for a Namespace](/docs/tasks/administer-cluster/manage-resources/memory-constraint-namespace/)
421+
433422
* [Configure Minimum and Maximum CPU Constraints for a Namespace](/docs/tasks/administer-cluster/manage-resources/cpu-constraint-namespace/)
423+
434424
* [Configure Memory and CPU Quotas for a Namespace](/docs/tasks/administer-cluster/manage-resources/quota-memory-cpu-namespace/)
425+
435426
* [Configure a Pod Quota for a Namespace](/docs/tasks/administer-cluster/manage-resources/quota-pod-namespace/)
427+
436428
* [Configure Quotas for API Objects](/docs/tasks/administer-cluster/quota-api-object/)
429+
437430
* [Control Topology Management policies on a node](/docs/tasks/administer-cluster/topology-manager/)
438431
-->
439432
### 集群管理员参考
@@ -446,4 +439,3 @@ kubectl delete namespace qos-example
446439
* [为名字空间配置 Pod 配额](/zh-cn/docs/tasks/administer-cluster/manage-resources/quota-pod-namespace/)
447440
* [为 API 对象配置配额](/zh-cn/docs/tasks/administer-cluster/quota-api-object/)
448441
* [控制节点上的拓扑管理策略](/zh-cn/docs/tasks/administer-cluster/topology-manager/)
449-

0 commit comments

Comments
 (0)