From 78c25c9f58f9890ce178385e6cf8d4f9171bb7cd Mon Sep 17 00:00:00 2001 From: Aaron Crawfis Date: Wed, 14 Apr 2021 15:22:36 -0700 Subject: [PATCH 1/6] Add links to enabling HA mode --- .../en/operations/hosting/kubernetes/kubernetes-production.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-production.md b/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-production.md index 4d3f1643f..717cc2141 100644 --- a/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-production.md +++ b/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-production.md @@ -59,7 +59,9 @@ The CPU and memory limits above account for the fact that Dapr is intended to a ## Highly-available mode -When deploying Dapr in a production-ready configuration, it's recommended to deploy with a highly available configuration of the control plane, which creates 3 replicas of each control plane pod in the dapr-system namespace. +When deploying Dapr in a production-ready configuration, it's recommended to deploy with a highly available (HA) configuration of the control plane, which creates 3 replicas of each control plane pod in the dapr-system namespace. This configuration allows for the Dapr control plane to survive node failures and other outages. + +HA mode can be enabled with both the [Dapr CLI]({{< ref "kubernetes-deploy.md#install-in-highly-available-mode" >}} and with [Helm charts]({{< ref "kubernetes-deploy.md#add-and-install-dapr-helm-chart" >}}). ## Deploying Dapr with Helm From e990781af02384e30cfc48c7b6a80101df93ce72 Mon Sep 17 00:00:00 2001 From: Aaron Crawfis Date: Wed, 14 Apr 2021 15:47:25 -0700 Subject: [PATCH 2/6] Update link to kafka installation --- .../components-reference/supported-pubsub/setup-apache-kafka.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 32381b2f6..b687a7abf 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 @@ -77,7 +77,7 @@ To run without Docker, see the getting started guide [here](https://kafka.apache {{% /codetab %}} {{% codetab %}} -To run Kafka on Kubernetes, you can use the [Helm Chart](https://github.com/helm/charts/tree/master/incubator/kafka#installing-the-chart). +To run Kafka on Kubernetes, you can use any Kafka operator, such as [Strimzi](https://strimzi.io/docs/operators/latest/quickstart.html#ref-install-prerequisites-str). {{% /codetab %}} {{< /tabs >}} From e873702052bb938e6f0c72f1c410634698930645 Mon Sep 17 00:00:00 2001 From: Aaron Crawfis Date: Wed, 14 Apr 2021 15:51:13 -0700 Subject: [PATCH 3/6] Add clarification to command --- daprdocs/content/en/getting-started/install-dapr-selfhost.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daprdocs/content/en/getting-started/install-dapr-selfhost.md b/daprdocs/content/en/getting-started/install-dapr-selfhost.md index deafe843c..411638acb 100644 --- a/daprdocs/content/en/getting-started/install-dapr-selfhost.md +++ b/daprdocs/content/en/getting-started/install-dapr-selfhost.md @@ -96,7 +96,7 @@ bin components config.yaml {{% /codetab %}} {{% codetab %}} -Open `%USERPROFILE%\.dapr\` in file explorer: +Using Command Prompt (not PowerShell), open `%USERPROFILE%\.dapr\` in file explorer: ```powershell explorer "%USERPROFILE%\.dapr\" From d46b799c3d31b606d21820ae4106fb465a47ba73 Mon Sep 17 00:00:00 2001 From: Javier Vela Date: Thu, 15 Apr 2021 06:37:46 +0200 Subject: [PATCH 4/6] fix link pubsub content types --- .../building-blocks/pubsub/howto-publish-subscribe.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-publish-subscribe.md b/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-publish-subscribe.md index affecfbf8..0e848db1c 100644 --- a/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-publish-subscribe.md +++ b/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-publish-subscribe.md @@ -480,7 +480,7 @@ dapr --app-id app2 run -- php app2.php Dapr automatically takes the data sent on the publish request and wraps it in a CloudEvent 1.0 envelope. If you want to use your own custom CloudEvent, make sure to specify the content type as `application/cloudevents+json`. -See info about content types [here](#Content-Types). +See info about content types [here](#content-types) and [Cloud Events message format](https://docs.dapr.io/developing-applications/building-blocks/pubsub/pubsub-overview/#cloud-events-message-format) ## Next steps From 4f95fecb6194aacdc3f8dfdac996085ebbc6d803 Mon Sep 17 00:00:00 2001 From: Javier Vela Date: Thu, 15 Apr 2021 20:08:36 +0200 Subject: [PATCH 5/6] Update howto-publish-subscribe.md to follow the Hugo shortcode convention Co-authored-by: Aaron Crawfis --- .../building-blocks/pubsub/howto-publish-subscribe.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-publish-subscribe.md b/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-publish-subscribe.md index 654c30d05..9a4fa5d1a 100644 --- a/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-publish-subscribe.md +++ b/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-publish-subscribe.md @@ -480,7 +480,7 @@ dapr --app-id app2 run -- php app2.php Dapr automatically takes the data sent on the publish request and wraps it in a CloudEvent 1.0 envelope. If you want to use your own custom CloudEvent, make sure to specify the content type as `application/cloudevents+json`. -See info about content types [here](#content-types) and [Cloud Events message format](https://docs.dapr.io/developing-applications/building-blocks/pubsub/pubsub-overview/#cloud-events-message-format) +Read about content types [here](#content-types), and about the [Cloud Events message format]({{< ref "pubsub-overview.md#cloud-events-message-format" >}}). ## Next steps From b869f064bb73690b54a00cf635d99d0aa2d92f85 Mon Sep 17 00:00:00 2001 From: Ori Zohar Date: Fri, 16 Apr 2021 11:57:53 -0700 Subject: [PATCH 6/6] Updates for v1.1.2 patch --- .../content/en/getting-started/install-dapr-selfhost.md | 2 +- .../en/operations/hosting/kubernetes/kubernetes-deploy.md | 4 ++-- .../operations/hosting/kubernetes/kubernetes-upgrade.md | 8 ++++---- .../operations/hosting/self-hosted/self-hosted-upgrade.md | 4 ++-- .../en/operations/support/support-release-policy.md | 7 ++++--- daprdocs/content/en/reference/cli/dapr-upgrade.md | 4 ++-- 6 files changed, 15 insertions(+), 14 deletions(-) diff --git a/daprdocs/content/en/getting-started/install-dapr-selfhost.md b/daprdocs/content/en/getting-started/install-dapr-selfhost.md index deafe843c..a7cfd81e4 100644 --- a/daprdocs/content/en/getting-started/install-dapr-selfhost.md +++ b/daprdocs/content/en/getting-started/install-dapr-selfhost.md @@ -53,7 +53,7 @@ dapr --version Output should look like this: ``` CLI version: 1.1.0 -Runtime version: 1.1.1 +Runtime version: 1.1.2 ``` ### Step 4: Verify containers are running diff --git a/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-deploy.md b/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-deploy.md index c9ab45a4d..903686169 100644 --- a/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-deploy.md +++ b/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-deploy.md @@ -122,7 +122,7 @@ The latest Dapr helm chart no longer supports Helm v2. Please migrate from Helm ```bash helm upgrade --install dapr dapr/dapr \ - --version=1.1.1 \ + --version=1.1.2 \ --namespace dapr-system \ --create-namespace \ --wait @@ -132,7 +132,7 @@ The latest Dapr helm chart no longer supports Helm v2. Please migrate from Helm ```bash helm upgrade --install dapr dapr/dapr \ - --version=1.1.1 \ + --version=1.1.2 \ --namespace dapr-system \ --create-namespace \ --set global.ha.enabled=true \ diff --git a/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-upgrade.md b/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-upgrade.md index af60f9bdc..e393fc5aa 100644 --- a/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-upgrade.md +++ b/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-upgrade.md @@ -11,15 +11,15 @@ description: "Follow these steps to upgrade Dapr on Kubernetes and ensure a smoo - [Dapr CLI]({{< ref install-dapr-cli.md >}}) - [Helm 3](https://github.com/helm/helm/releases) (if using Helm) -## Upgrade existing cluster to 1.1.1 +## Upgrade existing cluster to 1.1.2 There are two ways to upgrade the Dapr control plane on a Kubernetes cluster using either the Dapr CLI or Helm. ### Dapr CLI -The example below shows how to upgrade to version 1.1.1: +The example below shows how to upgrade to version 1.1.2: ```bash - dapr upgrade -k --runtime-version=1.1.1 + dapr upgrade -k --runtime-version=1.1.2 ``` You can provide all the available Helm chart configurations using the Dapr CLI. @@ -43,7 +43,7 @@ To resolve this issue please run the follow command to upgrade the CustomResourc kubectl replace -f https://raw.githubusercontent.com/dapr/dapr/5a15b3e0f093d2d0938b12f144c7047474a290fe/charts/dapr/crds/configuration.yaml ``` -Then proceed with the `dapr upgrade --runtime-version 1.1.1 -k` command as above. +Then proceed with the `dapr upgrade --runtime-version 1.1.2 -k` command as above. ### Helm diff --git a/daprdocs/content/en/operations/hosting/self-hosted/self-hosted-upgrade.md b/daprdocs/content/en/operations/hosting/self-hosted/self-hosted-upgrade.md index f7fd22ffc..1faf33c89 100644 --- a/daprdocs/content/en/operations/hosting/self-hosted/self-hosted-upgrade.md +++ b/daprdocs/content/en/operations/hosting/self-hosted/self-hosted-upgrade.md @@ -25,11 +25,11 @@ description: "Follow these steps to upgrade Dapr in self-hosted mode and ensure dapr init ``` -1. Ensure you are using the latest version of Dapr (v1.1.1) with: +1. Ensure you are using the latest version of Dapr (v1.1.2) with: ```bash $ dapr --version CLI version: 1.1.0 - Runtime version: 1.1.1 + Runtime version: 1.1.2 ``` diff --git a/daprdocs/content/en/operations/support/support-release-policy.md b/daprdocs/content/en/operations/support/support-release-policy.md index 30c76d10e..385f949fd 100644 --- a/daprdocs/content/en/operations/support/support-release-policy.md +++ b/daprdocs/content/en/operations/support/support-release-policy.md @@ -35,6 +35,7 @@ The table below shows the versions of Dapr releases that have been tested togeth | Mar 4th 2021 | 1.0.1
| 1.0.1 | Java 1.0.2
Go 1.0.0
PHP 1.0.0
Python 1.0.0
.NET 1.0.0 | 0.6.0 | Supported | | Apr 1st 2021 | 1.1.0
| 1.1.0 | Java 1.0.2
Go 1.1.0
PHP 1.0.0
Python 1.1.0
.NET 1.1.0 | 0.6.0 | Supported | | Apr 6th 2021 | 1.1.1
| 1.1.0 | Java 1.0.2
Go 1.1.0
PHP 1.0.0
Python 1.1.0
.NET 1.1.0 | 0.6.0 | Supported (current) | +| Apr 16th 2021 | 1.1.2
| 1.1.0 | Java 1.0.2
Go 1.1.0
PHP 1.0.0
Python 1.1.0
.NET 1.1.0 | 0.6.0 | Supported (current) | ## Upgrade paths After the 1.0 release of the runtime there may be situations where it is necessary to explicitly upgrade through an additional release to reach the desired target. For example an upgrade from v1.0 to v1.2 may need go pass through v1.1 @@ -46,10 +47,10 @@ General guidance on upgrading can be found for [self hosted mode]({{