From e990781af02384e30cfc48c7b6a80101df93ce72 Mon Sep 17 00:00:00 2001
From: Aaron Crawfis <Aaron.Crawfis@microsoft.com>
Date: Wed, 14 Apr 2021 15:47:25 -0700
Subject: [PATCH 1/3] 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 <Aaron.Crawfis@microsoft.com>
Date: Wed, 14 Apr 2021 15:51:13 -0700
Subject: [PATCH 2/3] 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 fee83875a8b039be17dea00d2f43d90b728c33a8 Mon Sep 17 00:00:00 2001
From: Aaron Crawfis <Aaron.Crawfis@microsoft.com>
Date: Wed, 14 Apr 2021 16:01:26 -0700
Subject: [PATCH 3/3] Add note on mTLS

---
 .../hosting/kubernetes/kubernetes-upgrade.md           | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-upgrade.md b/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-upgrade.md
index af60f9bdc..12c97ea61 100644
--- a/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-upgrade.md
+++ b/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-upgrade.md
@@ -22,6 +22,16 @@ The example below shows how to upgrade to version 1.1.1:
   dapr upgrade -k --runtime-version=1.1.1
   ```
 
+{{% alert title="Note" color="warning" %}}
+If you are using Dapr CLI v1.1.0 there is a known issue where mTLS will be enabled by default, even on clusters where it is disabled. If your cluster has mTLS disabled, and you would like it to stay disabled, add `--set global.mtls.enabled=false` to your upgrade command:
+
+```bash
+dapr upgrade -k --runtime-version 1.1.1 --set global.mtls.enabled=false
+```
+
+You can track the issue here: [#664](https://github.com/dapr/cli/issues/664).
+{{% /alert %}}
+
 You can provide all the available Helm chart configurations using the Dapr CLI.
 See [here](https://github.com/dapr/cli#supplying-helm-values) for more info.