diff --git a/.github/holopin.yml b/.github/holopin.yml index 44a7f0c8a4f..cea56f8853e 100644 --- a/.github/holopin.yml +++ b/.github/holopin.yml @@ -1,6 +1,6 @@ organization: dapr -defaultSticker: clmjkxscc122740fl0mkmb7egi +defaultSticker: clrqf84g1199090gldi6kf00gc stickers: - - id: clmjkxscc122740fl0mkmb7egi - alias: ghc2023 + id: clrqf84g1199090gldi6kf00gc + alias: docs-badge diff --git a/daprdocs/config.toml b/daprdocs/config.toml index 7cc01783f1d..f9f3c36e9cf 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] @@ -180,7 +188,7 @@ offlineSearch = false github_repo = "https://github.com/dapr/docs" github_project_repo = "https://github.com/dapr/dapr" github_subdir = "daprdocs" -github_branch = "v1.12" +github_branch = "v1.13" # Versioning version_menu = "v1.13 (latest)" diff --git a/daprdocs/content/en/contributing/contributing-overview.md b/daprdocs/content/en/contributing/contributing-overview.md index 1ccdf006ea6..4e84c5071ce 100644 --- a/daprdocs/content/en/contributing/contributing-overview.md +++ b/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 diff --git a/daprdocs/content/en/contributing/presentations.md b/daprdocs/content/en/contributing/presentations.md index e49a142cf77..f675510f20b 100644 --- a/daprdocs/content/en/contributing/presentations.md +++ b/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. diff --git a/daprdocs/content/en/developing-applications/building-blocks/workflow/workflow-patterns.md b/daprdocs/content/en/developing-applications/building-blocks/workflow/workflow-patterns.md index 2d1b1aea272..f7865f55e9c 100644 --- a/daprdocs/content/en/developing-applications/building-blocks/workflow/workflow-patterns.md +++ b/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 diff --git a/daprdocs/content/en/developing-applications/integrations/Diagrid/_index.md b/daprdocs/content/en/developing-applications/integrations/Diagrid/_index.md new file mode 100644 index 00000000000..0f0f87fac8f --- /dev/null +++ b/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" +--- \ No newline at end of file diff --git a/daprdocs/content/en/developing-applications/integrations/Diagrid/diagrid-conductor.md b/daprdocs/content/en/developing-applications/integrations/Diagrid/diagrid-conductor.md new file mode 100644 index 00000000000..554ca118a23 --- /dev/null +++ b/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 +--- + +
Diagrid Conductor diagram + +[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" >}} diff --git a/daprdocs/content/en/developing-applications/sdks/_index.md b/daprdocs/content/en/developing-applications/sdks/_index.md index 321d053cd19..b4a16e454bf 100644 --- a/daprdocs/content/en/developing-applications/sdks/_index.md +++ b/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 >}})
[FastAPI]({{< ref python-fastapi.md >}})
[Flask]({{< ref python-flask.md >}})| ✔ | ✔ | -| [Java]({{< ref java >}}) | Stable | ✔ | Spring Boot | ✔ | | -| [Go]({{< ref go >}}) | Stable | ✔ | ✔ | ✔ | | +| [Java]({{< ref java >}}) | Stable | ✔ | Spring Boot
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 diff --git a/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-production.md b/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-production.md index 365187bc991..971b7698ef6 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). diff --git a/daprdocs/content/en/operations/support/support-release-policy.md b/daprdocs/content/en/operations/support/support-release-policy.md index 8a1b63b59a1..51e11749b8a 100644 --- a/daprdocs/content/en/operations/support/support-release-policy.md +++ b/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
| 1.13.0 | Java 1.11.0
Go 1.10.0
PHP 1.2.0
Python 1.13.0
.NET 1.13.0
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
| 1.13.0 | Java 1.11.0
Go 1.10.0
PHP 1.2.0
Python 1.13.0
.NET 1.13.0
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
| 1.13.0 | Java 1.11.0
Go 1.10.0
PHP 1.2.0
Python 1.13.0
.NET 1.13.0
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
| 1.12.0 | Java 1.10.0
Go 1.9.1
PHP 1.2.0
Python 1.12.0
.NET 1.12.0
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
| 1.12.0 | Java 1.10.0
Go 1.9.1
PHP 1.2.0
Python 1.12.0
.NET 1.12.0
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 diff --git a/daprdocs/content/en/reference/components-reference/supported-configuration-stores/azure-appconfig-configuration-store.md b/daprdocs/content/en/reference/components-reference/supported-configuration-stores/azure-appconfig-configuration-store.md index c9f26f2a26c..eb591b99e83 100644 --- a/daprdocs/content/en/reference/components-reference/supported-configuration-stores/azure-appconfig-configuration-store.md +++ b/daprdocs/content/en/reference/components-reference/supported-configuration-stores/azure-appconfig-configuration-store.md @@ -40,7 +40,7 @@ spec: - name: azureCertificateFile # Optional value : "[pfx_certificate_file_fully_qualified_local_path]" - name: subscribePollInterval # Optional - value: #Optional [Expected format example - 30s] + value: #Optional [Expected format example - 24h] ``` @@ -57,7 +57,7 @@ The above example uses secrets as plain strings. It is recommended to use a secr | maxRetries | N | Maximum number of retries before giving up. Defaults to `3` | `5`, `10` | retryDelay | N | RetryDelay specifies the initial amount of delay to use before retrying an operation. The delay increases exponentially with each retry up to the maximum specified by MaxRetryDelay. Defaults to `4` seconds; `"-1"` disables delay between retries. | `4s` | maxRetryDelay | N | MaxRetryDelay specifies the maximum delay allowed before retrying an operation. Typically the value is greater than or equal to the value specified in RetryDelay. Defaults to `120` seconds; `"-1"` disables the limit | `120s` -| subscribePollInterval | N | subscribePollInterval specifies the poll interval in nanoseconds for polling the subscribed keys for any changes. This will be updated in the future to Go Time format. Default polling interval is set to `24` hours. | `30s` +| subscribePollInterval | N | subscribePollInterval specifies the poll interval in nanoseconds for polling the subscribed keys for any changes. This will be updated in the future to Go Time format. Default polling interval is set to `24` hours. | `24h` **Note**: either `host` or `connectionString` must be specified. diff --git a/daprdocs/content/en/reference/components-reference/supported-pubsub/setup-apache-kafka.md b/daprdocs/content/en/reference/components-reference/supported-pubsub/setup-apache-kafka.md index f5dc7faa568..6355e413bd1 100644 --- a/daprdocs/content/en/reference/components-reference/supported-pubsub/setup-apache-kafka.md +++ b/daprdocs/content/en/reference/components-reference/supported-pubsub/setup-apache-kafka.md @@ -462,7 +462,8 @@ You can configure pub/sub to publish or consume data encoded using [Avro binary ### Configuration {{% alert title="Important" color="warning" %}} -Currently, only message value serialization/deserialization is supported. Since cloud events are not supported, the `rawPayload=true` metadata must be passed. +Currently, only message value serialization/deserialization is supported. Since cloud events are not supported, the `rawPayload=true` metadata must be passed when publishing Avro messages. +Please note that `rawPayload=true` should NOT be set for consumers, as the message value will be wrapped into a CloudEvent and base64-encoded. Leaving `rawPayload` as default (i.e. `false`) will send the Avro-decoded message to the application as a JSON payload. {{% /alert %}} When configuring the Kafka pub/sub component metadata, you must define: @@ -533,7 +534,6 @@ def subscribe(): 'topic': 'my-topic', 'route': 'my_topic_subscriber', 'metadata': { - 'rawPayload': 'true', 'valueSchemaType': 'Avro', } }] return subscriptions diff --git a/daprdocs/static/images/diagrid-conductor.png b/daprdocs/static/images/diagrid-conductor.png new file mode 100644 index 00000000000..0d702e2b7f2 Binary files /dev/null and b/daprdocs/static/images/diagrid-conductor.png differ diff --git a/translations/docs-zh b/translations/docs-zh index 7938567259e..864b558a7c2 160000 --- a/translations/docs-zh +++ b/translations/docs-zh @@ -1 +1 @@ -Subproject commit 7938567259e1dcaba7bb3fbfca88ed9db92cefaa +Subproject commit 864b558a7c253f037f4c8bd21a579a5dab5e1456