From 326a54eee55468e72046d01882ff70060e5913ad Mon Sep 17 00:00:00 2001 From: newbe36524 Date: Fri, 15 Mar 2024 22:54:41 +0800 Subject: [PATCH 1/2] add translation in zh-Hans for v1.13 Signed-off-by: newbe36524 --- daprdocs/config.toml | 26 +++++++++++++++++--------- translations/docs-zh | 2 +- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/daprdocs/config.toml b/daprdocs/config.toml index 7cc01783f..e2cae12d5 100644 --- a/daprdocs/config.toml +++ b/daprdocs/config.toml @@ -105,37 +105,45 @@ id = "G-60C6Q1ETC1" lang = "en" [[module.mounts]] - source = "../translations/docs-zh/content/zh-hans" + source = "../translations/docs-zh/translated_content/zh_CN/docs" target = "content" lang = "zh-hans" [[module.mounts]] - source = "../translations/docs-zh/content/contributing" - target = "content/contributing/docs-contrib/docs-templates" + source = "../translations/docs-zh/translated_content/zh_CN/contributing" + target = "content/contributing/sdk-contrib/" lang = "zh-hans" [[module.mounts]] - source = "../translations/docs-zh/content/sdks_python" + source = "../translations/docs-zh/translated_content/zh_CN/sdks_python" target = "content/developing-applications/sdks/python" lang = "zh-hans" [[module.mounts]] - source = "../translations/docs-zh/content/sdks_php" + source = "../translations/docs-zh/translated_content/zh_CN/sdks_php" target = "content/developing-applications/sdks/php" lang = "zh-hans" [[module.mounts]] - source = "../translations/docs-zh/content/sdks_dotnet" + source = "../translations/docs-zh/translated_content/zh_CN/sdks_dotnet" target = "content/developing-applications/sdks/dotnet" lang = "zh-hans" [[module.mounts]] - source = "../translations/docs-zh/content/sdks_java" + source = "../translations/docs-zh/translated_content/zh_CN/sdks_java" target = "content/developing-applications/sdks/java" lang = "zh-hans" [[module.mounts]] - source = "../translations/docs-zh/content/sdks_go" + source = "../translations/docs-zh/translated_content/zh_CN/sdks_go" target = "content/developing-applications/sdks/go" lang = "zh-hans" [[module.mounts]] - source = "../translations/docs-zh/content/sdks_js" + source = "../translations/docs-zh/translated_content/zh_CN/sdks_js" target = "content/developing-applications/sdks/js" lang = "zh-hans" + [[module.mounts]] + source = "../translations/docs-zh/translated_content/zh_CN/pluggable-components/dotnet" + target = "content/developing-applications/develop-components/pluggable-components/pluggable-components-sdks/pluggable-components-dotnet" + lang = "zh-hans" + [[module.mounts]] + source = "../translations/docs-zh/translated_content/zh_CN/pluggable-components/go" + target = "content/developing-applications/develop-components/pluggable-components/pluggable-components-sdks/pluggable-components-go" + lang = "zh-hans" # Markdown Engine - Allow inline html [markup] diff --git a/translations/docs-zh b/translations/docs-zh index 793856725..864b558a7 160000 --- a/translations/docs-zh +++ b/translations/docs-zh @@ -1 +1 @@ -Subproject commit 7938567259e1dcaba7bb3fbfca88ed9db92cefaa +Subproject commit 864b558a7c253f037f4c8bd21a579a5dab5e1456 From f1d11248bb1ceb0de766123313f6a6d7d0a4e071 Mon Sep 17 00:00:00 2001 From: Alice Gibbons Date: Wed, 27 Mar 2024 11:53:30 +0000 Subject: [PATCH 2/2] Remove memory limits in production (#4091) Signed-off-by: Alice Gibbons --- .../hosting/kubernetes/kubernetes-production.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-production.md b/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-production.md index 365187bc9..971b7698e 100644 --- a/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-production.md +++ b/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-production.md @@ -10,15 +10,14 @@ description: "Best practices for deploying Dapr to a Kubernetes cluster in a pro Dapr support for Kubernetes is aligned with [Kubernetes Version Skew Policy](https://kubernetes.io/releases/version-skew-policy/). -Use the following resource settings as a starting point. Requirements vary depending on cluster size, number of pods, and other factors. Perform individual testing to find the right values for your environment. +Use the following resource settings as a starting point. Requirements vary depending on cluster size, number of pods, and other factors. Perform individual testing to find the right values for your environment. In production, it's recommended to not add memory limits to the Dapr control plane components to avoid `OOMKilled` pod statuses. | Deployment | CPU | Memory |-------------|-----|------- -| **Operator** | Limit: 1, Request: 100m | Limit: 200Mi, Request: 100Mi -| **Sidecar Injector** | Limit: 1, Request: 100m | Limit: 200Mi, Request: 30Mi -| **Sentry** | Limit: 1, Request: 100m | Limit: 200Mi, Request: 30Mi -| **Placement** | Limit: 1, Request: 250m | Limit: 150Mi, Request: 75Mi -| **Dashboard** | Limit: 200m, Request: 50m | Limit: 200Mi, Request: 20Mi +| **Operator** | Limit: 1, Request: 100m | Request: 100Mi +| **Sidecar Injector** | Limit: 1, Request: 100m | Request: 30Mi +| **Sentry** | Limit: 1, Request: 100m | Request: 30Mi +| **Placement** | Limit: 1, Request: 250m | Request: 75Mi {{% alert title="Note" color="primary" %}} For more information, refer to the Kubernetes documentation on [CPU and Memory resource units and their meaning](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#resource-units-in-kubernetes).