Skip to content

Commit 452647b

Browse files
committed
sync kubernetes-api dns-pod-service sidecar-containers resource-usage-monitoring
1 parent 8af30f6 commit 452647b

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

content/zh-cn/docs/concepts/overview/kubernetes-api.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,14 +157,14 @@ document.
157157
如果没有使用 `Accept` 头指示资源类型,对于 `/api``/apis` 端点的默认响应将是一个非聚合的发现文档。
158158

159159
<!--
160-
The [discovery document](https://github.com/kubernetes/kubernetes/blob/release-{{< skew currentVersion >}}/api/discovery/aggregated_v2beta1.json)
160+
The [discovery document](https://github.com/kubernetes/kubernetes/blob/release-{{< skew currentVersion >}}/api/discovery/aggregated_v2.json)
161161
for the built-in resources can be found in the Kubernetes GitHub repository.
162162
This Github document can be used as a reference of the base set of the available resources
163163
if a Kubernetes cluster is not available to query.
164164
165165
The endpoint also supports ETag and protobuf encoding.
166166
-->
167-
内置资源的[发现文档](https://github.com/kubernetes/kubernetes/blob/release-{{< skew currentVersion >}}/api/discovery/aggregated_v2beta1.json)可以在
167+
内置资源的[发现文档](https://github.com/kubernetes/kubernetes/blob/release-{{< skew currentVersion >}}/api/discovery/aggregated_v2.json)可以在
168168
Kubernetes GitHub 代码仓库中找到。如果手头没有 Kubernetes 集群可供查询,
169169
此 Github 文档可用作可用资源的基础集合的参考。端点还支持 ETag 和 protobuf 编码。
170170

content/zh-cn/docs/concepts/services-networking/dns-pod-service.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ depending on the IP family or families of the Service, with a name of the form
135135
of the Service.
136136
137137
[Headless Services](/docs/concepts/services-networking/service/#headless-services)
138-
(without a cluster IP) Services are also assigned DNS A and/or AAAA records,
138+
(without a cluster IP) are also assigned DNS A and/or AAAA records,
139139
with a name of the form `my-svc.my-namespace.svc.cluster-domain.example`. Unlike normal
140140
Services, this resolves to the set of IPs of all of the Pods selected by the Service.
141141
Clients are expected to consume the set or else use standard round-robin

content/zh-cn/docs/concepts/workloads/pods/sidecar-containers.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,9 @@ Init containers stop before the main containers start up, so init containers can
224224
exchange messages with the app container in a Pod. Any data passing is one-way
225225
(for example, an init container can put information inside an `emptyDir` volume).
226226
227+
Changing the image of a sidecar container will not cause the Pod to restart, but will
228+
trigger a container restart.
229+
227230
## Resource sharing within containers
228231
-->
229232
边车容器可以直接与主应用容器交互,因为与 Init 容器一样,
@@ -232,6 +235,8 @@ exchange messages with the app container in a Pod. Any data passing is one-way
232235
Init 容器在主容器启动之前停止,因此 Init 容器无法与 Pod 中的应用容器交换消息。
233236
所有数据传递都是单向的(例如,Init 容器可以将信息放入 `emptyDir` 卷中)。
234237

238+
变更边车容器的镜像不会导致 Pod 重启,但会触发容器重启。
239+
235240
## 容器内的资源共享 {#resource-sharing-within-containers}
236241

237242
{{< comment >}}

content/zh-cn/docs/tasks/debug/debug-cluster/resource-usage-monitoring.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ Kubernetes 不推荐任何特定的指标管道;
168168
Learn about additional debugging tools, including:
169169
170170
* [Logging](/docs/concepts/cluster-administration/logging/)
171-
* [Monitoring](/docs/tasks/debug/debug-cluster/resource-usage-monitoring/)
172171
* [Getting into containers via `exec`](/docs/tasks/debug/debug-application/get-shell-running-container/)
173172
* [Connecting to containers via proxies](/docs/tasks/extend-kubernetes/http-proxy-access-api/)
174173
* [Connecting to containers via port forwarding](/docs/tasks/access-application-cluster/port-forward-access-application-cluster/)
@@ -177,7 +176,6 @@ Learn about additional debugging tools, including:
177176
了解其他调试工具,包括:
178177

179178
* [日志记录](/zh-cn/docs/concepts/cluster-administration/logging/)
180-
* [监控](/zh-cn/docs/tasks/debug/debug-cluster/resource-usage-monitoring/)
181179
* [通过 `exec` 进入容器](/zh-cn/docs/tasks/debug/debug-application/get-shell-running-container/)
182180
* [通过代理连接到容器](/zh-cn/docs/tasks/extend-kubernetes/http-proxy-access-api/)
183181
* [通过端口转发连接到容器](/zh-cn/docs/tasks/access-application-cluster/port-forward-access-application-cluster/)

0 commit comments

Comments
 (0)