Merge branch 'v1.14' into hot-reload-subscriptions

.github/holopin.yml

@@ -1,6 +1,6 @@
 organization: dapr
-defaultSticker: clmjkxscc122740fl0mkmb7egi
+defaultSticker: clrqf84g1199090gldi6kf00gc
 stickers:
   -
-    id: clmjkxscc122740fl0mkmb7egi
-    alias: ghc2023
+    id: clrqf84g1199090gldi6kf00gc
+    alias: docs-badge

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/contributing/contributing-overview.md

@@ -8,11 +8,25 @@ description: >
 ---
 
 Thank you for your interest in Dapr!
-This document provides the guidelines for how to contribute to the [Dapr project](https://github.com/dapr) through issues and pull-requests. Contributions can also come in additional ways such as engaging with the community in community calls, commenting on issues or pull requests and more.
+This document provides the guidelines for how to contribute to the [Dapr project](https://github.com/dapr) through issues and pull requests. Contributions can also come in additional ways such as engaging with the community in community calls, commenting on issues or pull requests, and more.
 
 See the [Dapr community repository](https://github.com/dapr/community) for more information on community engagement and community membership.
 
-> If you are looking to contribute to the Dapr docs, please also see the specific guidelines for [docs contributions]({{< ref contributing-docs >}}).
+## Dapr Repository Index
+
+ Below is a list of repositories under the Dapr organization where you can contribute:
+
+1. **Docs**: This [repository](https://github.com/dapr/docs) contains the documentation for Dapr. You can contribute by updating existing documentation, fixing errors, or adding new content to improve user experience and clarity. Please see the specific guidelines for [docs contributions]({{< ref contributing-docs >}}).
+
+2. **Quickstarts**: The Quickstarts [repository](https://github.com/dapr/quickstarts) provides simple, step-by-step guides to help users get started with Dapr quickly. Contributions in this repository involve creating new quickstarts, improving existing ones, or ensuring they stay up-to-date with the latest features.
+
+3. **Runtime**: The Dapr runtime [repository](https://github.com/dapr/dapr) houses the core runtime components. Here, you can contribute by fixing bugs, optimizing performance, implementing new features, or enhancing existing ones.
+
+4. **Components-contrib**: This [repository](https://github.com/dapr/components-contrib) hosts a collection of community-contributed components for Dapr. You can contribute by adding new components, improving existing ones, or reviewing and testing contributions from the community.
+
+5. **SDKs**: Dapr SDKs provide libraries for various programming languages to interact with Dapr. You can contribute by improving SDK functionalities, fixing bugs, or adding support for new features. Please see the [contribution guidelines]({{< ref sdk-contrib >}}) for specific SDKs.
+
+6. **CLI**: Dapr cli sets up Dapr on a local dev machine or a Kubernetes cluster for launching and managing Dapr instances. Contributions to the CLI repository include adding new features, fixing bugs, improving usability, and ensuring compatibility with the latest Dapr releases. Please see the [Development Guide](https://github.com/dapr/cli/blob/master/docs/development/development.md) for help in getting started with developing the Dapr cli. 
 
 ## Issues
 

daprdocs/content/en/contributing/presentations.md

@@ -10,6 +10,13 @@ We welcome community members giving presentations on Dapr and spreading the word
 
 {{< button text="Download the Dapr Presentation Deck" link="/presentations/dapr-slidedeck.pptx.zip" >}}
 
+{{% alert color="primary" %}}
+If you're using the PowerPoint template with MacOS, please install the Space Grotesk font to ensure the text is rendered properly:
+```sh
+brew install --cask homebrew/cask-fonts/font-space-grotesk
+```
+{{% /alert %}}
+
 ## Giving a Dapr presentation
 
 - Begin by downloading the [Dapr Presentation Deck](/presentations/dapr-slidedeck.pptx.zip). This contains slides and diagrams needed to give a Dapr presentation.

daprdocs/content/en/developing-applications/building-blocks/secrets/secrets-overview.md

@@ -41,7 +41,7 @@ Applications can also use the secrets API to access secrets from a Kubernetes se
 - The Helm defaults, or
 - `dapr init -k`
 
-If you are using another secret store, you can disable (not configure) the Dapr Kubernetes secret store by setting `disable-builtin-k8s-secret-store` to `true` through the Helm settings. The default is `false`.
+If you are using another secret store, you can disable (not configure) the Dapr Kubernetes secret store by adding the annotation `dapr.io/disable-builtin-k8s-secret-store: "true"` to the deployment.yaml file. The default is `false`.
 
 In the example below, the application retrieves the same secret "mysecret" from a Kubernetes secret store.
 
@@ -86,4 +86,4 @@ Want to skip the quickstarts? Not a problem. You can try out the secret manageme
 ## Next steps
 
 - Learn [how to use secret scoping]({{< ref secrets-scopes.md >}}).
-- Read the [secrets API reference doc]({{< ref secrets_api.md >}}).
+- Read the [secrets API reference doc]({{< ref secrets_api.md >}}).

daprdocs/content/en/developing-applications/building-blocks/secrets/secrets-scopes.md

@@ -4,7 +4,6 @@ title: "How To: Use secret scoping"
 linkTitle: "How To: Use secret scoping"
 weight: 3000
 description: "Use scoping to limit the secrets that can be read by your application from secret stores"
-type: docs
 ---
 
 Once you [configure a secret store for your application]({{< ref setup-secret-store >}}), *any* secret defined within that store is accessible by default from the Dapr application. 
@@ -107,4 +106,4 @@ Scenarios | defaultAccess | allowedSecrets | deniedSecrets | permission
 ## Related links
 
 - List of [secret stores]({{< ref supported-secret-stores.md >}})
-- Overview of [secret stores]({{< ref setup-secret-store.md >}})
+- Overview of [secret stores]({{< ref setup-secret-store.md >}})

daprdocs/content/en/developing-applications/building-blocks/workflow/workflow-patterns.md

@@ -248,11 +248,11 @@ func TaskChainWorkflow(ctx *workflow.WorkflowContext) (any, error) {
 		return nil, err
 	}
 	var result2 int
-	if err := ctx.CallActivity(Step1, workflow.ActivityInput(input)).Await(&result2); err != nil {
+	if err := ctx.CallActivity(Step2, workflow.ActivityInput(input)).Await(&result2); err != nil {
 		return nil, err
 	}
 	var result3 int
-	if err := ctx.CallActivity(Step1, workflow.ActivityInput(input)).Await(&result3); err != nil {
+	if err := ctx.CallActivity(Step3, workflow.ActivityInput(input)).Await(&result3); err != nil {
 		return nil, err
 	}
 	return []int{result1, result2, result3}, nil

daprdocs/content/en/developing-applications/integrations/Diagrid/_index.md

@@ -0,0 +1,7 @@
+---
+type: docs
+title: "Integrations with Diagrid"
+linkTitle: "Diagrid"
+weight: 1000
+description: "Dapr integrations with Diagrid"
+---

daprdocs/content/en/developing-applications/integrations/Diagrid/diagrid-conductor.md

@@ -0,0 +1,31 @@
+---
+type: docs
+title: "Conductor: Enterprise Dapr for Kubernetes"
+linkTitle: "Diagrid Conductor"
+description: "Automate operations, enforce security best practices, improve uptime, and elevate insights across your Dapr clusters"
+weight: 2000
+---
+
+<br /><img src="/images/diagrid-conductor.png" alt="Diagrid Conductor diagram" width="800">
+
+[Diagrid Conductor](https://www.diagrid.io/conductor) quickly and securely connects to all your Kubernetes clusters running Dapr and Daprized applications, delivering operational excellence, security & reliability and insights & collaboration.
+
+**Automated Dapr management**
+
+One-click installation, upgrade and patching of Dapr with selective application update and automated rollback means you’re always up to date.
+
+**Advisor: Discover and automate best practices**
+
+Be informed and apply production best practices, with continuous checking to prevent misconfigurations, increasing security, reliability and performance.
+
+**Resource usage reporting  and tracking**
+
+By studying past resource behavior, recommend application resource optimization usage leading to significant cost savings on CPU and memory.
+
+**Application visualizer**
+
+The application graph facilitates collaboration between dev and ops by providing a dynamic overview of your services and infrastructure components.
+
+Try out [Conductor Free](https://www.diagrid.io/pricing), ideal for individual developers building and testing Dapr applications on Kubernetes.
+
+{{< button text="Learn more about Diagrid Conductor" link="https://www.diagrid.io/conductor" >}}

daprdocs/content/en/developing-applications/integrations/gRPC-integration.md

@@ -4,7 +4,6 @@ title: "How to: Use the gRPC interface in your Dapr application"
 linkTitle: "How to: gRPC interface"
 weight: 6000
 description: "Use the Dapr gRPC API in your application"
-type: docs
 ---
 
 Dapr implements both an HTTP and a gRPC API for local calls. [gRPC](https://grpc.io/) is useful for low-latency, high performance scenarios and has language integration using the proto clients.

daprdocs/content/en/developing-applications/sdks/_index.md

@@ -24,12 +24,12 @@ Select your [preferred language below]({{< ref "#sdk-languages" >}}) to learn mo
 |----------|:------|:----------:|:-----------:|:---------:|:---------:|
 | [.NET]({{< ref dotnet >}}) | Stable | ✔ |  [ASP.NET Core](https://github.com/dapr/dotnet-sdk/tree/master/examples/AspNetCore) | ✔ | ✔ |
 | [Python]({{< ref python >}}) | Stable | ✔ | [gRPC]({{< ref python-grpc.md >}}) <br />[FastAPI]({{< ref python-fastapi.md >}})<br />[Flask]({{< ref python-flask.md >}})| ✔ | ✔ |
-| [Java]({{< ref java >}}) | Stable | ✔ | Spring Boot | ✔ | |
-| [Go]({{< ref go >}}) | Stable | ✔ | ✔ | ✔ | |
+| [Java]({{< ref java >}}) | Stable | ✔ | Spring Boot  <br /> Quarkus| ✔ | ✔ |
+| [Go]({{< ref go >}}) | Stable | ✔ | ✔ | ✔ | ✔ |
 | [PHP]({{< ref php >}}) | Stable | ✔ | ✔ | ✔ | |
-| [Javascript]({{< ref js >}}) | Stable| ✔ | | ✔ | |
+| [Javascript]({{< ref js >}}) | Stable| ✔ | | ✔ | ✔  |
 | [C++](https://github.com/dapr/cpp-sdk) | In development | ✔ | | |
-| [Rust](https://github.com/dapr/rust-sdk) | In development | ✔ | | | |
+| [Rust](https://github.com/dapr/rust-sdk) | In development | ✔ | | ✔ | |
 
 ## Further reading
 

daprdocs/content/en/operations/hosting/kubernetes/kubernetes-job.md

@@ -4,7 +4,6 @@ title: "Running Dapr with a Kubernetes Job"
 linkTitle: "Kubernetes Jobs"
 weight: 70000
 description: "Use Dapr API in a Kubernetes Job context"
-type: docs
 ---
 
 The Dapr sidecar is designed to be a long running process. In the context of a [Kubernetes Job](https://kubernetes.io/docs/concepts/workloads/controllers/job/) this behavior can block your job completion.
@@ -67,4 +66,4 @@ func main() {
 ## Related links
 
 - [Deploy Dapr on Kubernetes]({{< ref kubernetes-deploy.md >}})
-- [Upgrade Dapr on Kubernetes]({{< ref kubernetes-upgrade.md >}})
+- [Upgrade Dapr on Kubernetes]({{< ref kubernetes-upgrade.md >}})

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

daprdocs/content/en/operations/observability/tracing/otel-collector/open-telemetry-collector-jaeger.md

@@ -4,7 +4,6 @@ title: "Using OpenTelemetry Collector to collect traces to send to Jaeger"
 linkTitle: "Using the OpenTelemetry for Jaeger"
 weight: 1200
 description: "How to push trace events to Jaeger distributed tracing platform, using the OpenTelemetry Collector."
-type: docs
 ---
 
 While Dapr supports writing traces using OpenTelemetry (OTLP) and Zipkin protocols, Zipkin support for Jaeger has been deprecated in favor of OTLP. Although Jaeger supports OTLP directly, the recommended approach for production is to use the OpenTelemetry Collector to collect traces from Dapr and send them to Jaeger, allowing your application to quickly offload data and take advantage of features like retries, batching, and encryption. For more information, read the Open Telemetry Collector [documentation](https://opentelemetry.io/docs/collector/#when-to-use-a-collector).

daprdocs/content/en/operations/observability/tracing/zipkin.md

@@ -4,7 +4,6 @@ title: "How-To: Set up Zipkin for distributed tracing"
 linkTitle: "Zipkin"
 weight: 4000
 description: "Set up Zipkin for distributed tracing"
-type: docs
 ---
 
 ## Configure self hosted mode

daprdocs/content/en/operations/resiliency/health-checks/sidecar-health.md

@@ -126,6 +126,21 @@ Dapr has its HTTP health endpoint `/v1.0/healthz` on port 3500. This can be used
       failureThreshold: 3
 ```
 
+## Delay graceful shutdown
+
+Dapr accepts a [`dapr.io/block-shutdown-duration` annotation or `--dapr-block-shutdown-duration` CLI flag]({{< ref arguments-annotations-overview.md >}}), which delays the full shutdown procedure for the specified duration, or until the app reports as unhealthy, whichever is sooner. 
+
+During this period, all subscriptions and input bindings are closed. This is useful for applications that need to use the Dapr APIs as part of their own shutdown procedure. 
+
+Applicable annotations or CLI flags include:
+
+- `--dapr-graceful-shutdown-seconds`/`dapr.io/graceful-shutdown-seconds`
+- `--dapr-block-shutdown-duration`/`dapr.io/block-shutdown-duration`
+- `--dapr-graceful-shutdown-seconds`/`dapr.io/graceful-shutdown-seconds`
+- `--dapr-block-shutdown-duration`/`dapr.io/block-shutdown-duration`
+
+Learn more about these and how to use them in the [Annotations and arguments guide.]({{< ref arguments-annotations-overview.md >}})
+
 ## Related links
 
 - [Endpoint health API]({{< ref health_api.md >}})

daprdocs/content/en/operations/support/support-release-policy.md

@@ -45,6 +45,8 @@ The table below shows the versions of Dapr releases that have been tested togeth
 
 | Release date | Runtime     | CLI  | SDKs  | Dashboard  | Status | Release notes |
 |--------------------|:--------:|:--------|---------|---------|---------|------------|
+| April 3rd 2024 | 1.13.2</br>  | 1.13.0 | Java 1.11.0 </br>Go 1.10.0 </br>PHP 1.2.0 </br>Python 1.13.0 </br>.NET 1.13.0 </br>JS 3.3.0 | 0.14.0 | Supported (current) | [v1.13.2 release notes](https://github.com/dapr/dapr/releases/tag/v1.13.2) |
+| March 26th 2024 | 1.13.1</br>  | 1.13.0 | Java 1.11.0 </br>Go 1.10.0 </br>PHP 1.2.0 </br>Python 1.13.0 </br>.NET 1.13.0 </br>JS 3.3.0 | 0.14.0 | Supported (current) | [v1.13.1 release notes](https://github.com/dapr/dapr/releases/tag/v1.13.1) |
 | March 6th 2024 | 1.13.0</br>  | 1.13.0 | Java 1.11.0 </br>Go 1.10.0 </br>PHP 1.2.0 </br>Python 1.13.0 </br>.NET 1.13.0 </br>JS 3.3.0 | 0.14.0 | Supported (current) | [v1.13.0 release notes](https://github.com/dapr/dapr/releases/tag/v1.13.0) |
 | January 17th 2024 | 1.12.4</br>  | 1.12.0 | Java 1.10.0 </br>Go 1.9.1 </br>PHP 1.2.0 </br>Python 1.12.0 </br>.NET 1.12.0 </br>JS 3.2.0 | 0.14.0 | Supported (current) | [v1.12.4 release notes](https://github.com/dapr/dapr/releases/tag/v1.12.4) |
 | January 2nd 2024 | 1.12.3</br>  | 1.12.0 | Java 1.10.0 </br>Go 1.9.1 </br>PHP 1.2.0 </br>Python 1.12.0 </br>.NET 1.12.0 </br>JS 3.2.0 | 0.14.0 | Supported (current) | [v1.12.3 release notes](https://github.com/dapr/dapr/releases/tag/v1.12.3) |
@@ -133,7 +135,7 @@ General guidance on upgrading can be found for [self hosted mode]({{< ref self-h
 | 1.10.0                   |                   N/A |                   1.10.8 |
 | 1.11.0                   |                   N/A |                   1.11.4 |
 | 1.12.0                   |                   N/A |                   1.12.4 |
-| 1.13.0                   |                   N/A |                   1.13.0 |
+| 1.13.0                   |                   N/A |                   1.13.2 |
 
 ## Upgrade on Hosting platforms