1996fanrui commented on code in PR #830:
URL:
https://github.com/apache/flink-kubernetes-operator/pull/830#discussion_r1629028807
##########
docs/content/docs/custom-resource/pod-template.md:
##########
@@ -26,21 +26,18 @@ under the License.
# Pod template
-The operator CRD is designed to have a minimal set of direct, short-hand CRD
settings to express the most
-basic attributes of a deployment. For all other settings the CRD provides the
`flinkConfiguration` and
-`podTemplate` fields.
+<a name="pod-template"></a>
-Pod templates permit customization of the Flink job and task manager pods, for
example to specify
-volume mounts, ephemeral storage, sidecar containers etc.
+Operator CRD 被设计为一组直接、简短的 CRD 设置,以表达部署的最基本属性。对于所有其他设置,CRD 提供了
`flinkConfiguration` 和 `podTemplate` 字段。
Review Comment:
```suggestion
Operator CRD 被设计为一组直接、简短的 CRD 设置,以表达 deployment 的最基本属性。对于所有其他设置,CRD 提供了
`flinkConfiguration` 和 `podTemplate` 字段。
```
We don't need to translate `deployment `.
##########
docs/content/docs/custom-resource/pod-template.md:
##########
@@ -26,21 +26,18 @@ under the License.
# Pod template
-The operator CRD is designed to have a minimal set of direct, short-hand CRD
settings to express the most
-basic attributes of a deployment. For all other settings the CRD provides the
`flinkConfiguration` and
-`podTemplate` fields.
+<a name="pod-template"></a>
-Pod templates permit customization of the Flink job and task manager pods, for
example to specify
-volume mounts, ephemeral storage, sidecar containers etc.
+Operator CRD 被设计为一组直接、简短的 CRD 设置,以表达部署的最基本属性。对于所有其他设置,CRD 提供了
`flinkConfiguration` 和 `podTemplate` 字段。
-Pod templates can be layered, as shown in the example below.
-A common pod template may hold the settings that apply to both job and task
manager,
-like `volumeMounts`. Another template under job or task manager can define
additional settings that supplement or override those
-in the common template, such as a task manager sidecar.
+Pod templates 保证了 Flink 作业和任务管理器 pod 的自定义,例如指定卷挂载、临时存储、sidecar 容器等。
-The operator is going to merge the common and specific templates for job and
task manager respectively.
+Pod template 可以被分层,如下面的示例所示。
+一个通用的 pod template 可以保存适用于作业和任务管理器的设置,比如
`volumeMounts`。作业或任务管理器下的另一个模板可以定义补充或覆盖通用模板中的其他设置,比如一个任务管理器 sidecar。
-Here the full example:
+Operator 将分别合并作业和任务管理器的通用和特定模板。
Review Comment:
Same comment as above.
##########
docs/content/docs/custom-resource/pod-template.md:
##########
@@ -26,21 +26,18 @@ under the License.
# Pod template
-The operator CRD is designed to have a minimal set of direct, short-hand CRD
settings to express the most
-basic attributes of a deployment. For all other settings the CRD provides the
`flinkConfiguration` and
-`podTemplate` fields.
+<a name="pod-template"></a>
-Pod templates permit customization of the Flink job and task manager pods, for
example to specify
-volume mounts, ephemeral storage, sidecar containers etc.
+Operator CRD 被设计为一组直接、简短的 CRD 设置,以表达部署的最基本属性。对于所有其他设置,CRD 提供了
`flinkConfiguration` 和 `podTemplate` 字段。
-Pod templates can be layered, as shown in the example below.
-A common pod template may hold the settings that apply to both job and task
manager,
-like `volumeMounts`. Another template under job or task manager can define
additional settings that supplement or override those
-in the common template, such as a task manager sidecar.
+Pod templates 保证了 Flink 作业和任务管理器 pod 的自定义,例如指定卷挂载、临时存储、sidecar 容器等。
Review Comment:
```suggestion
Pod templates 允许自定义 Flink Job 和 Task Manager 的 pod,例如指定卷挂载、临时存储、sidecar 容器等。
```
Task Manager should be translated as well.
##########
docs/content/docs/custom-resource/pod-template.md:
##########
@@ -125,4 +124,4 @@ arr1: [{name: a, p2: v2}, {name: c, p2: v2}]
merged: [{name: a, p1: v1, p2: v2}, {name: b, p1: v1}, {name: c, p2: v2}]
```
-Merging by name can we be very convenient when merging container specs or when
the base and override templates are not defined together.
+当合并容器规范或者当基础模板和覆盖模板没有一起定义时,按名称合并可以非常方便。
Review Comment:
```suggestion
当合并容器规格或者当基础模板和覆盖模板没有一起定义时,按名称合并可以非常方便。
```
The original English doc doesn't need the `we`, right?
If yes, we can remove it in this PR directly.
##########
docs/content/docs/custom-resource/pod-template.md:
##########
@@ -26,21 +26,18 @@ under the License.
# Pod template
-The operator CRD is designed to have a minimal set of direct, short-hand CRD
settings to express the most
-basic attributes of a deployment. For all other settings the CRD provides the
`flinkConfiguration` and
-`podTemplate` fields.
+<a name="pod-template"></a>
-Pod templates permit customization of the Flink job and task manager pods, for
example to specify
-volume mounts, ephemeral storage, sidecar containers etc.
+Operator CRD 被设计为一组直接、简短的 CRD 设置,以表达部署的最基本属性。对于所有其他设置,CRD 提供了
`flinkConfiguration` 和 `podTemplate` 字段。
-Pod templates can be layered, as shown in the example below.
-A common pod template may hold the settings that apply to both job and task
manager,
-like `volumeMounts`. Another template under job or task manager can define
additional settings that supplement or override those
-in the common template, such as a task manager sidecar.
+Pod templates 保证了 Flink 作业和任务管理器 pod 的自定义,例如指定卷挂载、临时存储、sidecar 容器等。
-The operator is going to merge the common and specific templates for job and
task manager respectively.
+Pod template 可以被分层,如下面的示例所示。
+一个通用的 pod template 可以保存适用于作业和任务管理器的设置,比如
`volumeMounts`。作业或任务管理器下的另一个模板可以定义补充或覆盖通用模板中的其他设置,比如一个任务管理器 sidecar。
Review Comment:
task manager should be translated here.
##########
docs/content/docs/custom-resource/pod-template.md:
##########
@@ -93,16 +90,18 @@ spec:
```
{{< hint info >}}
-When using the operator with Flink native Kubernetes integration, please refer
to [pod template field precedence](
-https://nightlies.apache.org/flink/flink-docs-master/docs/deployment/resource-providers/native_kubernetes/#fields-overwritten-by-flink).
+当使用具有 Flink 原生 Kubernetes 集成的 operator 时,请参考 [pod template 字段优先级](
+https://nightlies.apache.org/flink/flink-docs-master/docs/deployment/resource-providers/native_kubernetes/#fields-overwritten-by-flink)。
{{< /hint >}}
+
## Array Merging Behaviour
-When layering pod templates (defining both a top level and jobmanager specific
podtemplate for example) the corresponding yamls are merged together.
+<a name="array-meging-behaviour"></a>
+
+当分层 pod templates(例如同时定义顶级和任务管理器特定的 pod 模板)时,相应的 yaml 会合并在一起。
-The default behaviour of the pod template mechanism is to merge array arrays
by merging the objects in the respective array positions.
-This requires that containers in the podTemplates are defined in the same
order otherwise the results may be undefined.
+Pod 模板机制的默认行为是通过合并相应数组位置的对象合并 json 类型的数组。
Review Comment:
```suggestion
Pod 模板机制的默认行为是通过合并相应数组位置的对象来合并数组。
```
Why introducing json?
##########
docs/content/docs/custom-resource/pod-template.md:
##########
@@ -93,16 +90,18 @@ spec:
```
{{< hint info >}}
-When using the operator with Flink native Kubernetes integration, please refer
to [pod template field precedence](
-https://nightlies.apache.org/flink/flink-docs-master/docs/deployment/resource-providers/native_kubernetes/#fields-overwritten-by-flink).
+当使用具有 Flink 原生 Kubernetes 集成的 operator 时,请参考 [pod template 字段优先级](
+https://nightlies.apache.org/flink/flink-docs-master/docs/deployment/resource-providers/native_kubernetes/#fields-overwritten-by-flink)。
{{< /hint >}}
+
## Array Merging Behaviour
-When layering pod templates (defining both a top level and jobmanager specific
podtemplate for example) the corresponding yamls are merged together.
+<a name="array-meging-behaviour"></a>
+
+当分层 pod templates(例如同时定义顶级和任务管理器特定的 pod 模板)时,相应的 yaml 会合并在一起。
-The default behaviour of the pod template mechanism is to merge array arrays
by merging the objects in the respective array positions.
-This requires that containers in the podTemplates are defined in the same
order otherwise the results may be undefined.
Review Comment:
Is this sentence missed?
##########
docs/content/docs/custom-resource/pod-template.md:
##########
@@ -93,16 +90,18 @@ spec:
```
{{< hint info >}}
-When using the operator with Flink native Kubernetes integration, please refer
to [pod template field precedence](
-https://nightlies.apache.org/flink/flink-docs-master/docs/deployment/resource-providers/native_kubernetes/#fields-overwritten-by-flink).
+当使用具有 Flink 原生 Kubernetes 集成的 operator 时,请参考 [pod template 字段优先级](
Review Comment:
```suggestion
当使用与 Flink 原生 Kubernetes 集成的 operator 时,请参考 [pod template 字段优先级](
```
##########
docs/content/docs/custom-resource/pod-template.md:
##########
@@ -113,10 +112,10 @@ arr1: [{name: a, p2: v2}, {name: c, p2: v2}]
merged: [{name: a, p1: v1, p2: v2}, {name: c, p1: v1, p2: v2}]
```
-The operator supports an alternative array merging mechanism that can be
enabled by the `kubernetes.operator.pod-template.merge-arrays-by-name` flag.
-When true, instead of the default positional merging, object array elements
that have a `name` property defined will be merged by their name and the
resulting array will be a union of the two input arrays.
+Operator 支持另一种数组合并机制,可以通过
`kubernetes.operator.pod-template.merge-arrays-by-name` 标志启用。
+当为 true 时,将按名称合并具有 `name` 属性定义的对象数组元素,并且生成的数组将是两个输入数组的并集。
Review Comment:
```suggestion
当为 true 时,不会进行默认的位置合并,而是根据名称合并定义了 `name` 属性的对象数组元素,并且生成的数组将是两个输入数组的并集。
```
`instead of the default positional merging, ` is missed here.
##########
docs/content/docs/custom-resource/pod-template.md:
##########
@@ -93,16 +90,18 @@ spec:
```
{{< hint info >}}
-When using the operator with Flink native Kubernetes integration, please refer
to [pod template field precedence](
-https://nightlies.apache.org/flink/flink-docs-master/docs/deployment/resource-providers/native_kubernetes/#fields-overwritten-by-flink).
+当使用具有 Flink 原生 Kubernetes 集成的 operator 时,请参考 [pod template 字段优先级](
+https://nightlies.apache.org/flink/flink-docs-master/docs/deployment/resource-providers/native_kubernetes/#fields-overwritten-by-flink)。
{{< /hint >}}
+
## Array Merging Behaviour
-When layering pod templates (defining both a top level and jobmanager specific
podtemplate for example) the corresponding yamls are merged together.
+<a name="array-meging-behaviour"></a>
+
+当分层 pod templates(例如同时定义顶级和任务管理器特定的 pod 模板)时,相应的 yaml 会合并在一起。
-The default behaviour of the pod template mechanism is to merge array arrays
by merging the objects in the respective array positions.
-This requires that containers in the podTemplates are defined in the same
order otherwise the results may be undefined.
+Pod 模板机制的默认行为是通过合并相应数组位置的对象合并 json 类型的数组。
Default behaviour (merge by position):
Review Comment:
Why don't translate this line?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]