Merge branch 'v1.11' into azure-ad-auth-update

daprdocs/content/en/developing-applications/building-blocks/pubsub/subscription-methods.md

@@ -187,7 +187,11 @@ The `/checkout` endpoint matches the `route` defined in the subscriptions and th
 
 ### Programmatic subscriptions
 
-The programmatic approach returns the `routes` JSON structure within the code, unlike the declarative approach's `route` YAML structure. In the example below, you define the values found in the [declarative YAML subscription](#declarative-subscriptions) above within the application code.
+The dynamic programmatic approach returns the `routes` JSON structure within the code, unlike the declarative approach's `route` YAML structure. 
+
+> **Note:** Programmatic subscriptions are only read once during application start-up. You cannot _dynamically_ add new programmatic subscriptions, only at new ones at compile time.
+
+In the example below, you define the values found in the [declarative YAML subscription](#declarative-subscriptions) above within the application code.
 
 {{< tabs ".NET" Java Python JavaScript Go>}}
 

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

@@ -66,6 +66,7 @@ From version 1.0.0 onwards, upgrading Dapr using Helm is no longer a disruptive
    kubectl replace -f https://raw.githubusercontent.com/dapr/dapr/v{{% dapr-latest-version long="true" %}}/charts/dapr/crds/configuration.yaml
    kubectl replace -f https://raw.githubusercontent.com/dapr/dapr/v{{% dapr-latest-version long="true" %}}/charts/dapr/crds/subscription.yaml
    kubectl apply -f https://raw.githubusercontent.com/dapr/dapr/v{{% dapr-latest-version long="true" %}}/charts/dapr/crds/resiliency.yaml
+   kubectl apply -f https://raw.githubusercontent.com/dapr/dapr/v{{% dapr-latest-version long="true" %}}/charts/dapr/crds/httpendpoints.yaml
    ```
 
    ```bash

daprdocs/content/en/reference/components-reference/supported-pubsub/setup-jetstream.md

@@ -31,16 +31,14 @@ spec:
     value: "/path/to/tls.key"
   - name: token # Optional. Used for token based authentication.
     value: "my-token"
-  - name: consumerID
-    value: "channel1"
   - name: name
     value: "my-conn-name"
   - name: streamName
     value: "my-stream"
   - name: durableName 
-    value: "my-durable"
+    value: "my-durable-subscription"
   - name: queueGroupName
-    value: "my-queue"
+    value: "my-queue-group"
   - name: startSequence
     value: 1
   - name: startTime # In Unix format
@@ -83,7 +81,6 @@ spec:
 | tls_client_cert |    N     | NATS TLS Client Authentication Certificate | `"/path/to/tls.crt"`             |
 | tls_client_key  |    N     | NATS TLS Client Authentication Key         | `"/path/to/tls.key"`             |
 | token           |    N     | [NATS token based authentication]          | `"my-token"`                     |
-| consumerID      |    N     | Consumer ID (consumer tag) organizes one or more consumers into a group. Consumers with the same consumer ID work as one virtual consumer; for example, a message is processed only once by one of the consumers in the group. If the `consumerID` is not provided, the Dapr runtime set it to the Dapr application ID (`appID`) value. | `"channel1"`
 | name            |    N     | NATS connection name                       | `"my-conn-name"`                 |
 | streamName      |    N     | Name of the JetStream Stream to bind to    | `"my-stream"`                    |
 | durableName     |    N     | [Durable name]                             | `"my-durable"`                   |
@@ -146,6 +143,31 @@ It is essential to create a NATS JetStream for a specific subject. For example,
 nats -s localhost:4222 stream add myStream --subjects mySubject
 ```
 
+## Example: Competing consumers pattern
+
+Let's say you'd like each message to be processed by only one application or pod with the same app-id. Typically, the `consumerID` metadata spec helps you define competing consumers. 
+
+Since `consumerID` is not supported in NATS JetStream, you need to specify `durableName` and `queueGroupName` to achieve the competing consumers pattern. For example:
+
+```yml
+apiVersion: dapr.io/v1alpha1
+kind: Component
+metadata:
+  name: pubsub
+spec:
+  type: pubsub.jetstream
+  version: v1
+  metadata:
+  - name: name
+    value: "my-conn-name"
+  - name: streamName
+    value: "my-stream"
+  - name: durableName 
+    value: "my-durable-subscription"
+  - name: queueGroupName
+    value: "my-queue-group"
+```
+
 ## Related links
 - [Basic schema for a Dapr component]({{< ref component-schema >}})
 - Read [this guide]({{< ref "howto-publish-subscribe.md#step-2-publish-a-topic" >}}) for instructions on configuring pub/sub components