Merge branch 'v1.6' into bug/dotnet_statemgt_example

daprdocs/content/en/concepts/overview.md

@@ -21,7 +21,7 @@ Today we are experiencing a wave of cloud adoption. Developers are comfortable w
 
 This is where Dapr comes in. Dapr codifies the *best practices* for building microservice applications into open, independent APIs called building blocks, that enable you to build portable applications with the language and framework of your choice. Each building block is completely independent and you can use one, some, or all of them in your application.
 
-Using Dapr you can incrementally migrate your existing applications to a microserivces architecture, thereby adopting cloud native patterns such scale out/in, resilency and independent deployments.
+Using Dapr you can incrementally migrate your existing applications to a microserivces architecture, thereby adopting cloud native patterns such scale out/in, resiliency and independent deployments.
 
 In addition, Dapr is platform agnostic, meaning you can run your applications locally, on any Kubernetes cluster, on virtual or physical machines and in other hosting environments that Dapr integrates with. This enables you to build microservice applications that can run on the cloud and edge.
 

daprdocs/content/en/developing-applications/building-blocks/configuration/howto-manage-configuration.md

@@ -156,7 +156,42 @@ dapr run --app-id orderprocessing --components-path ./components python3 OrderPr
 
 {{< /tabs >}}
 
-### Watch configuration items
+### Get configuration items using gRPC API
+
+Using your [favorite language](https://grpc.io/docs/languages/), create a Dapr gRPC client from the [Dapr proto](https://github.com/dapr/dapr/blob/master/dapr/proto/runtime/v1/dapr.proto). The following examples show Java, C#, Python and Javascript clients.
+
+{{< tabs Java Dotnet Python Javascript >}}
+
+{{% codetab %}}
+```java
+
+Dapr.ServiceBlockingStub stub = Dapr.newBlockingStub(channel);
+stub.GetConfigurationAlpha1(new GetConfigurationRequest{ StoreName = "redisconfigstore", Keys = new String[]{"myconfig"} });
+```
+{{% /codetab %}}
+
+{{% codetab %}}
+```csharp
+
+var call = client.GetConfigurationAlpha1(new GetConfigurationRequest { StoreName = "redisconfigstore", Keys = new String[]{"myconfig"} });
+```
+{{% /codetab %}}
+
+{{% codetab %}}
+```python
+response = stub.GetConfigurationAlpha1(request={ StoreName: 'redisconfigstore', Keys = ['myconfig'] })
+```
+{{% /codetab %}}
+
+{{% codetab %}}
+```javascript
+client.GetConfigurationAlpha1({ StoreName: 'redisconfigstore', Keys = ['myconfig'] })
+```
+{{% /codetab %}}
+
+{{< /tabs >}}
+
+##### Watch configuration items
 
 Create a Dapr gRPC client from the [Dapr proto](https://github.com/dapr/dapr/blob/master/dapr/proto/runtime/v1/dapr.proto) using your [preferred language](https://grpc.io/docs/languages/). Then use the proto method `SubscribeConfigurationAlpha1` on your client stub to start subscribing to events. The method accepts the following request object:
 
@@ -177,7 +212,7 @@ message SubscribeConfigurationRequest {
 
 Using this method, you can subscribe to changes in specific keys for a given configuration store. gRPC streaming varies widely based on language - see the [gRPC examples here](https://grpc.io/docs/languages/) for usage.
 
-### Stop watching configuration items
+##### Stop watching configuration items
 
 After you have subscribed to watch configuration items, the gRPC-server stream starts. This stream thread does not close itself, and you have to do by explicitly call the `UnSubscribeConfigurationRequest` API. This method accepts the following request object:
 

daprdocs/content/en/developing-applications/integrations/Azure/azure-kubernetes-service-extension.md

@@ -0,0 +1,89 @@
+---
+type: docs
+title: "Dapr extension for Azure Kubernetes Service (AKS)"
+linkTitle: "Dapr extension for Azure Kubernetes Service (AKS)"
+description: "Provision Dapr on your Azure Kubernetes Service (AKS) cluster with the Dapr extension"
+weight: 4000
+---
+
+# Prerequisites
+- [Azure subscription](https://azure.microsoft.com/free/?WT.mc_id=A261C142F)
+- [Azure CLI](https://docs.microsoft.com/cli/azure/install-azure-cli-windows?tabs=azure-cli) and the ***aks-preview*** extension.
+- [Azure Kubernetes Service (AKS) cluster](https://docs.microsoft.com/azure/aks/tutorial-kubernetes-deploy-cluster?tabs=azure-cli)
+
+## Install Dapr using the AKS Dapr extension
+The recommended approach for installing Dapr on AKS is to use the AKS Dapr extension. The extension offers support for all native Dapr configuration capabilities through command-line arguments via the Azure CLI and offers the option of opting into automatic minor version upgrades of the Dapr runtime.
+
+{{% alert title="Note" color="warning" %}}
+If you install Dapr through the AKS extension, our recommendation is to continue using the extension for future management of Dapr instead of the Dapr CLI. Combining the two tools can cause conflicts and result in undesired behavior.
+{{% /alert %}}
+
+### How the extension works
+The Dapr extension works by provisioning the Dapr control plane on your AKS cluster through the Azure CLI. The dapr control plane consists of:
+
+- **dapr-operator**: Manages component updates and Kubernetes services endpoints for Dapr (state stores, pub/subs, etc.)
+- **dapr-sidecar-injector**: Injects Dapr into annotated deployment pods and adds the environment variables `DAPR_HTTP_PORT` and `DAPR_GRPC_PORT`. This enables user-defined applications to communicate with Dapr without the need to hard-code Dapr port values. 
+- **dapr-placement**: Used for actors only. Creates mapping tables that map actor instances to pods
+- **dapr-sentry**: Manages mTLS between services and acts as a certificate authority. For more information read the security overview.
+
+### Extension Prerequisites 
+In order to use the AKS Dapr extension, you must first enable the `AKS-ExtensionManager` and `AKS-Dapr` feature flags on your Azure subscription.
+
+The below command will register the `AKS-ExtensionManager` and `AKS-Dapr` feature flags on your Azure subscription:
+
+```bash
+az feature register --namespace "Microsoft.ContainerService" --name "AKS-ExtensionManager"
+az feature register --namespace "Microsoft.ContainerService" --name "AKS-Dapr"
+```
+
+After a few minutes, check the status to show `Registered`. Confirm the registration status by using the az feature list command:
+
+```bash
+az feature list -o table --query "[?contains(name, 'Microsoft.ContainerService/AKS-ExtensionManager')].{Name:name,State:properties.state}"
+az feature list -o table --query "[?contains(name, 'Microsoft.ContainerService/AKS-Dapr')].{Name:name,State:properties.state}"
+```
+
+Next, refresh the registration of the `Microsoft.KubernetesConfiguration` and `Microsoft.ContainerService` resource providers by using the az provider register command:
+
+```bash
+az provider register --namespace Microsoft.KubernetesConfiguration
+az provider register --namespace Microsoft.ContainerService
+```
+
+#### Enable the Azure CLI extension for cluster extensions
+You will also need the `k8s-extension` Azure CLI extension. Install this by running the following commands:
+
+```bash
+az extension add --name k8s-extension
+```
+
+If the `k8s-extension` extension is already present, you can update it to the latest version using the below command:
+
+```bash
+az extension update --name k8s-extension
+```
+
+#### Create the extension and install Dapr on your AKS cluster
+After your subscription is registered to use Kubernetes extensions, install Dapr on your cluster by creating the Dapr extension. For example:
+
+```bash
+az k8s-extension create --cluster-type managedClusters \
+--cluster-name myAKSCluster \
+--resource-group myResourceGroup \
+--name myDaprExtension \
+--extension-type Microsoft.Dapr
+```
+
+Additionally, Dapr can automatically update its minor version. To enable this, set the `--auto-upgrade-minor-version` parameter to true:
+
+```bash
+--auto-upgrade-minor-version true
+```
+
+Once the k8-extension finishes provisioning, you can confirm that the Dapr control plane is installed on your AKS cluster by running: 
+
+```bash
+kubectl get pods -n dapr-system
+```
+
+For further information such as configuration options and targeting specific versions of Dapr, please see the official [AKS Dapr Extension Docs](https://docs.microsoft.com/azure/aks/dapr).

daprdocs/content/en/operations/hosting/kubernetes/cluster/_index.md

@@ -2,7 +2,7 @@
 type: docs
 title: "Kubernetes cluster setup"
 linkTitle: "How-to: Setup clusters"
-weight: 80000
+weight: 15000
 description: >
   How to create a Kubernetes cluster
 ---

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

@@ -22,9 +22,10 @@ For more information on what is deployed to your Kubernetes cluster read the [Ku
 
 You can install Dapr on any Kubernetes cluster. Here are some helpful links:
 
+- [Setup KiNd Cluster]({{< ref setup-kind.md >}})
 - [Setup Minikube Cluster]({{< ref setup-minikube.md >}})
 - [Setup Azure Kubernetes Service Cluster]({{< ref setup-aks.md >}})
-- [Setup Google Cloud Kubernetes Engine](https://cloud.google.com/kubernetes-engine/docs/quickstart)
+- [Setup Google Cloud Kubernetes Engine](https://docs.dapr.io/operations/hosting/kubernetes/cluster/setup-gke/)
 - [Setup Amazon Elastic Kubernetes Service](https://docs.aws.amazon.com/eks/latest/userguide/getting-started.html)
 
 {{% alert title="Hybrid clusters" color="primary" %}}

daprdocs/content/en/operations/monitoring/tracing/supported-tracing-backends/jaeger.md

@@ -83,7 +83,7 @@ spec:
 
 #### Production
 
-Jaeger uses Elasticsearch as the backend storage, and you can create a secret in k8s cluster to access Elasticsearch server with access control. See [Configuring and Deploying Jaeger](https://docs.openshift.com/container-platform/4.9/distr_tracing/distr_tracing_install/distr-tracing-deploying.html)
+Jaeger uses Elasticsearch as the backend storage, and you can create a secret in k8s cluster to access Elasticsearch server with access control.
 
 ```shell
 kubectl create secret generic jaeger-secret --from-literal=ES_PASSWORD='xxx' --from-literal=ES_USERNAME='xxx' -n ${NAMESPACE}

daprdocs/content/en/reference/api/pubsub_api.md

@@ -51,7 +51,7 @@ The `Content-Type` header tells Dapr which content type your data adheres to whe
 The value of the `Content-Type` header populates the `datacontenttype` field in the CloudEvent.
 Unless specified, Dapr assumes `text/plain`. If your content type is JSON, use a `Content-Type` header with the value of `application/json`.
 
-If you want to send your own custom CloundEvent, use the `application/cloudevents+json` value for the `Content-Type` header.
+If you want to send your own custom CloudEvent, use the `application/cloudevents+json` value for the `Content-Type` header.
 
 #### Metadata