From 652e74c39d44de94db808a82c2ac9442ab779824 Mon Sep 17 00:00:00 2001 From: newbe36524 Date: Mon, 5 Apr 2021 15:58:13 +0800 Subject: [PATCH 01/19] update content to v1.1 --- translations/docs-zh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/docs-zh b/translations/docs-zh index 036fc63bf..1ab6c6133 160000 --- a/translations/docs-zh +++ b/translations/docs-zh @@ -1 +1 @@ -Subproject commit 036fc63bf0a919843827e263ec287d55e3188b7b +Subproject commit 1ab6c613330f14da5af23f44053a7bba8da91052 From db86e59f565b38503cb0b6e34d96fc403359d18d Mon Sep 17 00:00:00 2001 From: fabistb <63794579+fabistb@users.noreply.github.com> Date: Sun, 11 Apr 2021 20:54:10 +0200 Subject: [PATCH 02/19] add delete operation to azure blob storage --- .../supported-bindings/blobstorage.md | 77 +++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/daprdocs/content/en/reference/components-reference/supported-bindings/blobstorage.md b/daprdocs/content/en/reference/components-reference/supported-bindings/blobstorage.md index 6eb4529bc..7b9ffe813 100644 --- a/daprdocs/content/en/reference/components-reference/supported-bindings/blobstorage.md +++ b/daprdocs/content/en/reference/components-reference/supported-bindings/blobstorage.md @@ -54,6 +54,7 @@ This component supports **output binding** with the following operations: - `create` : [Create blob](#create-blob) - `get` : [Get blob](#get-blob) +- `delete`: [Delete blob](#delete-blob) ### Create blob @@ -201,6 +202,82 @@ To perform a get blob operation, invoke the Azure Blob Storage binding with a `P The response body contains the value stored in the blob object. +### Delete Blob + +To perform a delete blob operation, invoke the Azure Blob Storage binding with a `POST` method and the following JSON body: + +```json +{ + "operation": "delete", + "metadata": { + "blobName": "myblob" + } +} +``` + +#### Examples + +##### Delete blob + +{{< tabs Windows Linux >}} + + {{% codetab %}} + ```bash + curl -d '{ \"operation\": \"delete\", \"metadata\": { \"blobName\": \"myblob\" }}' http://localhost:/v1.0/bindings/ + ``` + {{% /codetab %}} + + {{% codetab %}} + ```bash + curl -d '{ "operation": "delete", "metadata": { "blobName": "myblob" }}' \ + http://localhost:/v1.0/bindings/ + ``` + {{% /codetab %}} + +{{< /tabs >}} + +##### Delete blob snapshots only + +{{< tabs Windows Linux >}} + + {{% codetab %}} + ```bash + curl -d '{ \"operation\": \"delete\", \"metadata\": { \"blobName\": \"myblob\", \"DeleteSnapshotOptions\": \"only\" }}' http://localhost:/v1.0/bindings/ + ``` + {{% /codetab %}} + + {{% codetab %}} + ```bash + curl -d '{ "operation": "delete", "metadata": { "blobName": "myblob", "DeleteSnapshotOptions": "only" }}' \ + http://localhost:/v1.0/bindings/ + ``` + {{% /codetab %}} + +{{< /tabs >}} + +##### Delete blob including snapshots + +{{< tabs Windows Linux >}} + + {{% codetab %}} + ```bash + curl -d '{ \"operation\": \"delete\", \"metadata\": { \"blobName\": \"myblob\", \"DeleteSnapshotOptions\": \"include\" }}' http://localhost:/v1.0/bindings/ + ``` + {{% /codetab %}} + + {{% codetab %}} + ```bash + curl -d '{ "operation": "delete", "metadata": { "blobName": "myblob", "DeleteSnapshotOptions": "include" }}' \ + http://localhost:/v1.0/bindings/ + ``` + {{% /codetab %}} + +{{< /tabs >}} + +#### Response + +An HTTP 204 (No Content) and empty body will be retuned if successful. + ## Metadata information By default the Azure Blob Storage output binding auto generates a UUID as the blob filename and is not assigned any system or custom metadata to it. It is configurable in the metadata property of the message (all optional). From 80786d1c3347fb3fbfb714e4bf900f0668d580b7 Mon Sep 17 00:00:00 2001 From: fabistb <63794579+fabistb@users.noreply.github.com> Date: Tue, 13 Apr 2021 23:32:17 +0200 Subject: [PATCH 03/19] add missing space --- .../components-reference/supported-bindings/blobstorage.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daprdocs/content/en/reference/components-reference/supported-bindings/blobstorage.md b/daprdocs/content/en/reference/components-reference/supported-bindings/blobstorage.md index 7b9ffe813..9dffb5133 100644 --- a/daprdocs/content/en/reference/components-reference/supported-bindings/blobstorage.md +++ b/daprdocs/content/en/reference/components-reference/supported-bindings/blobstorage.md @@ -54,7 +54,7 @@ This component supports **output binding** with the following operations: - `create` : [Create blob](#create-blob) - `get` : [Get blob](#get-blob) -- `delete`: [Delete blob](#delete-blob) +- `delete` : [Delete blob](#delete-blob) ### Create blob From e49dd06c775407bde0ac789029e57dac8cf3e843 Mon Sep 17 00:00:00 2001 From: newbe36524 Date: Wed, 14 Apr 2021 21:02:41 +0800 Subject: [PATCH 04/19] update zh-hans content --- translations/docs-zh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/docs-zh b/translations/docs-zh index 1ab6c6133..e86abb5f4 160000 --- a/translations/docs-zh +++ b/translations/docs-zh @@ -1 +1 @@ -Subproject commit 1ab6c613330f14da5af23f44053a7bba8da91052 +Subproject commit e86abb5f4cecb77fb9e08ca9dd02832e312b04a8 From ce23a2511b7b5ad9ae2f9018b11806e67c910871 Mon Sep 17 00:00:00 2001 From: fabistb <63794579+fabistb@users.noreply.github.com> Date: Wed, 14 Apr 2021 20:16:45 +0200 Subject: [PATCH 05/19] change Delete Blob to Delete blob --- .../components-reference/supported-bindings/blobstorage.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daprdocs/content/en/reference/components-reference/supported-bindings/blobstorage.md b/daprdocs/content/en/reference/components-reference/supported-bindings/blobstorage.md index 9dffb5133..b48a0747b 100644 --- a/daprdocs/content/en/reference/components-reference/supported-bindings/blobstorage.md +++ b/daprdocs/content/en/reference/components-reference/supported-bindings/blobstorage.md @@ -202,7 +202,7 @@ To perform a get blob operation, invoke the Azure Blob Storage binding with a `P The response body contains the value stored in the blob object. -### Delete Blob +### Delete blob To perform a delete blob operation, invoke the Azure Blob Storage binding with a `POST` method and the following JSON body: From 78c25c9f58f9890ce178385e6cf8d4f9171bb7cd Mon Sep 17 00:00:00 2001 From: Aaron Crawfis Date: Wed, 14 Apr 2021 15:22:36 -0700 Subject: [PATCH 06/19] 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 07/19] 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 08/19] 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 0a690de926a4549236e29a8023e8dcb7fcda892f Mon Sep 17 00:00:00 2001 From: Aaron Crawfis Date: Wed, 14 Apr 2021 15:55:26 -0700 Subject: [PATCH 09/19] Add codeowners --- .github/CODEOWNERS | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 000000000..827b6bb07 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,10 @@ +# Documentation and examples for what this does: +# +# https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners + +# This file is a list of rules, with the last rule being most specific +# All of the people (and only those people) from the matching rule will be notified + +# Default rule: anything that doesn't match a more specific rule goes here + +@dapr/maintainers-docs From fee83875a8b039be17dea00d2f43d90b728c33a8 Mon Sep 17 00:00:00 2001 From: Aaron Crawfis Date: Wed, 14 Apr 2021 16:01:26 -0700 Subject: [PATCH 10/19] 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. From efe7e129c2a4a2510285153c144b38be0af7afd1 Mon Sep 17 00:00:00 2001 From: Aaron Crawfis Date: Wed, 14 Apr 2021 16:46:42 -0700 Subject: [PATCH 11/19] Switch from maintainers to approvers --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 827b6bb07..7e7f90be3 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -7,4 +7,4 @@ # Default rule: anything that doesn't match a more specific rule goes here -@dapr/maintainers-docs +@dapr/approvers-docs From d46b799c3d31b606d21820ae4106fb465a47ba73 Mon Sep 17 00:00:00 2001 From: Javier Vela Date: Thu, 15 Apr 2021 06:37:46 +0200 Subject: [PATCH 12/19] 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 a1d9f497ecda53bf73dd1bd78ed453915df8361d Mon Sep 17 00:00:00 2001 From: idjohnson Date: Thu, 15 Apr 2021 09:43:32 -0500 Subject: [PATCH 13/19] Update howto-bindings.md missed 'Content-Type: application/json' in curl command for testing binding --- .../building-blocks/bindings/howto-bindings.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daprdocs/content/en/developing-applications/building-blocks/bindings/howto-bindings.md b/daprdocs/content/en/developing-applications/building-blocks/bindings/howto-bindings.md index bcb383872..1cf0d6e88 100644 --- a/daprdocs/content/en/developing-applications/building-blocks/bindings/howto-bindings.md +++ b/daprdocs/content/en/developing-applications/building-blocks/bindings/howto-bindings.md @@ -80,7 +80,7 @@ All that's left now is to invoke the output bindings endpoint on a running Dapr You can do so using HTTP: ```bash -curl -X POST -H http://localhost:3500/v1.0/bindings/myevent -d '{ "data": { "message": "Hi!" }, "operation": "create" }' +curl -X POST -H 'Content-Type: application/json' http://localhost:3500/v1.0/bindings/myevent -d '{ "data": { "message": "Hi!" }, "operation": "create" }' ``` As seen above, you invoked the `/binding` endpoint with the name of the binding to invoke, in our case its `myevent`. From 4f95fecb6194aacdc3f8dfdac996085ebbc6d803 Mon Sep 17 00:00:00 2001 From: Javier Vela Date: Thu, 15 Apr 2021 20:08:36 +0200 Subject: [PATCH 14/19] 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 ddc3e08ce5cb60ee7f8087b20a1f4be2e295cc17 Mon Sep 17 00:00:00 2001 From: Phil Kedy Date: Fri, 16 Apr 2021 14:49:21 -0400 Subject: [PATCH 15/19] Adding Azure Service Bus publish retry settings --- .../supported-pubsub/setup-azure-servicebus.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/daprdocs/content/en/reference/components-reference/supported-pubsub/setup-azure-servicebus.md b/daprdocs/content/en/reference/components-reference/supported-pubsub/setup-azure-servicebus.md index 584151831..a22f2818f 100644 --- a/daprdocs/content/en/reference/components-reference/supported-pubsub/setup-azure-servicebus.md +++ b/daprdocs/content/en/reference/components-reference/supported-pubsub/setup-azure-servicebus.md @@ -8,7 +8,7 @@ aliases: --- ## Component format -To setup Azure Event Hubs pubsub create a component of type `pubsub.azure.servicebus`. See [this guide]({{< ref "howto-publish-subscribe.md#step-1-setup-the-pubsub-component" >}}) on how to create and apply a pubsub configuration. +To setup Azure Service Bus pubsub create a component of type `pubsub.azure.servicebus`. See [this guide]({{< ref "howto-publish-subscribe.md#step-1-setup-the-pubsub-component" >}}) on how to create and apply a pubsub configuration. ```yaml apiVersion: dapr.io/v1alpha1 @@ -50,6 +50,10 @@ spec: value: 30 - name: connectionRecoveryInSec # Optional value: 2 + - name: publishMaxRetries # Optional + value: 5 + - name: publishInitialRetryInternalInMs # Optional + value: 500 ``` > __NOTE:__ The above settings are shared across all topics that use this component. @@ -62,7 +66,7 @@ The above example uses secrets as plain strings. It is recommended to use a secr | Field | Required | Details | Example | |--------------------|:--------:|---------|---------| -| connectionString | Y | Connection-string for the Event Hubs | "`Endpoint=sb://{ServiceBusNamespace}.servicebus.windows.net/;SharedAccessKeyName={PolicyName};SharedAccessKey={Key};EntityPath={ServiceBus}`" +| connectionString | Y | Connection-string for the Service Bus | "`Endpoint=sb://{ServiceBusNamespace}.servicebus.windows.net/;SharedAccessKeyName={PolicyName};SharedAccessKey={Key};EntityPath={ServiceBus}`" | timeoutInSec | N | Timeout for sending messages and management operations. Default: `60` |`30` | handlerTimeoutInSec| N | Timeout for invoking app handler. # Optional. Default: `60` | `30` | disableEntityManagement | N | When set to true, topics and subscriptions do not get created automatically. Default: `"false"` | `"true"`, `"false"` @@ -77,6 +81,8 @@ The above example uses secrets as plain strings. It is recommended to use a secr | autoDeleteOnIdleInSec | N |Time in seconds to wait before auto deleting messages. | `10` | maxReconnectionAttempts | N |Defines the maximum number of reconnect attempts. Default: `30` | `30` | connectionRecoveryInSec | N |Time in seconds to wait between connection recovery attempts. Defaults: `2` | `2` +| publishMaxRetries | N | The max number of retries for when Azure Service Bus responds with "too busy" in order to throttle messages. Defaults: `5` | `5` +| publishInitialRetryInternalInMs | N | Time in milliseconds for the initial exponential backoff when Azure Service Bus throttle messages. Defaults: `500` | `500` ## Create an Azure Service Bus From b869f064bb73690b54a00cf635d99d0aa2d92f85 Mon Sep 17 00:00:00 2001 From: Ori Zohar Date: Fri, 16 Apr 2021 11:57:53 -0700 Subject: [PATCH 16/19] 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]({{ Date: Fri, 16 Apr 2021 14:48:23 -0700 Subject: [PATCH 17/19] Add maintainers --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 7e7f90be3..880330e1f 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -7,4 +7,4 @@ # Default rule: anything that doesn't match a more specific rule goes here -@dapr/approvers-docs +* @dapr/approvers-docs @dapr/maintainers-docs From 739e3f85bc57856b12aa4043336a19ecb6ac21c2 Mon Sep 17 00:00:00 2001 From: Javier Vela Date: Sun, 18 Apr 2021 20:45:36 +0200 Subject: [PATCH 18/19] Fix common issues format --- .../troubleshooting/common_issues.md | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/daprdocs/content/en/operations/troubleshooting/common_issues.md b/daprdocs/content/en/operations/troubleshooting/common_issues.md index 581a041ff..83358d1ce 100644 --- a/daprdocs/content/en/operations/troubleshooting/common_issues.md +++ b/daprdocs/content/en/operations/troubleshooting/common_issues.md @@ -9,7 +9,14 @@ description: "Common issues and problems faced when running Dapr applications" ## I don't see the Dapr sidecar injected to my pod There could be several reasons to why a sidecar will not be injected into a pod. -First, check your Deployment or Pod YAML file, and check that you have the following annotations in the right place: +First, check your deployment or pod YAML file, and check that you have the following annotations in the right place: + +```yaml +annotations: + dapr.io/enabled: "true" + dapr.io/app-id: "nodeapp" + dapr.io/app-port: "3000" +``` Sample deployment: @@ -31,9 +38,9 @@ spec: labels: app: node annotations: - dapr.io/enabled: "true" - dapr.io/app-id: "nodeapp" - dapr.io/app-port: "3000" + dapr.io/enabled: "true" + dapr.io/app-id: "nodeapp" + dapr.io/app-port: "3000" spec: containers: - name: node @@ -162,9 +169,9 @@ In Kubernetes, make sure the `dapr.io/app-port` annotation is specified: ```yaml annotations: - dapr.io/enabled: "true" - dapr.io/app-id: "nodeapp" - dapr.io/app-port: "3000" + dapr.io/enabled: "true" + dapr.io/app-id: "nodeapp" + dapr.io/app-port: "3000" ``` If using Dapr Standalone and the Dapr CLI, make sure you pass the `--app-port` flag to the `dapr run` command. From 93bd588221376e427ee5c6846010f355ca1a3f0b Mon Sep 17 00:00:00 2001 From: Aaron Crawfis Date: Mon, 19 Apr 2021 19:31:49 -0700 Subject: [PATCH 19/19] Update daprdocs/content/en/operations/troubleshooting/common_issues.md --- daprdocs/content/en/operations/troubleshooting/common_issues.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daprdocs/content/en/operations/troubleshooting/common_issues.md b/daprdocs/content/en/operations/troubleshooting/common_issues.md index 83358d1ce..c5c36cc0f 100644 --- a/daprdocs/content/en/operations/troubleshooting/common_issues.md +++ b/daprdocs/content/en/operations/troubleshooting/common_issues.md @@ -18,7 +18,7 @@ annotations: dapr.io/app-port: "3000" ``` -Sample deployment: +### Sample deployment: ```yaml apiVersion: apps/v1