Merge branch 'v1.13' into issue_4081

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]

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).