Merge branch 'v1.4' into patch-2

daprdocs/content/en/_index.md

@@ -8,12 +8,12 @@ no_list: true
     <div class="card-body">
       <h5 class="card-title">
         <img src="/images/daprcon.png" alt="DaprCon logo" width=40>
-        <b> Join us for DaprCon on October 19th-20th, 2021!</b>
+        <b> Watch DaprCon sessions on-demand!</b>
       </h5>
       <p class="card-text">
-        The first ever DaprCon will take place October 19th-20th, 2021 virtually! Tune in for free and attend technical sessions, panels and real world examples from the community on building applications with Dapr! <br></br><i><b>Learn more >></b></i>
+        The first ever DaprCon took place October 19th-20th, 2021. Read this recap and find links to all on-demand content <br></br><i><b>Learn more >></b></i>
       </p>
-      <a href="https://blog.dapr.io/posts/2021/10/05/join-us-for-daprcon-october-19th-20th-2021/" class="stretched-link"></a>
+      <a href="https://blog.dapr.io/posts/2021/10/21/thanks-for-a-great-first-daprcon/" class="stretched-link"></a>
     </div>
   </div>
 </div>

daprdocs/content/en/contributing/contributing-docs.md

@@ -334,6 +334,8 @@ The shortcode would be:
 
 To create a button in a webpage, use the `button` shortcode.
 
+An optional "newtab" parameter will indicate if the page should open in a new tab. Options are "true" or "false". Default is "false", where the page will open in the same tab.
+
 #### Link to an external page
 
 ```
@@ -346,10 +348,10 @@ To create a button in a webpage, use the `button` shortcode.
 
 You can also reference pages in your button as well:
 ```
-{{</* button text="My Button" page="contributing" */>}}
+{{</* button text="My Button" page="contributing" newtab="true" */>}}
 ```
 
-{{< button text="My Button" page="contributing" >}}
+{{< button text="My Button" page="contributing" newtab="true" >}}
 
 #### Button colors
 

daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-publish-subscribe.md

@@ -486,6 +486,33 @@ If you want to use your own custom CloudEvent, make sure to specify the content
 
 Read about content types [here](#content-types), and about the [Cloud Events message format]({{< ref "pubsub-overview.md#cloud-events-message-format" >}}).
 
+#### Example
+
+{{< tabs "Dapr CLI" "HTTP API (Bash)" "HTTP API (PowerShell)">}}
+
+{{% codetab %}}
+Publish a custom CloudEvent to the `deathStarStatus` topic:
+```bash
+dapr publish --publish-app-id testpubsub --pubsub pubsub --topic deathStarStatus --data '{"specversion" : "1.0", "type" : "com.dapr.cloudevent.sent", "source" : "testcloudeventspubsub", "subject" : "Cloud Events Test", "id" : "someCloudEventId", "time" : "2021-08-02T09:00:00Z", "datacontenttype" : "application/cloudevents+json", "data" : {"status": "completed"}}'
+```
+{{% /codetab %}}
+
+{{% codetab %}}
+Publish a custom CloudEvent to the `deathStarStatus` topic:
+```bash
+curl -X POST http://localhost:3500/v1.0/publish/pubsub/deathStarStatus -H "Content-Type: application/cloudevents+json" -d '{"specversion" : "1.0", "type" : "com.dapr.cloudevent.sent", "source" : "testcloudeventspubsub", "subject" : "Cloud Events Test", "id" : "someCloudEventId", "time" : "2021-08-02T09:00:00Z", "datacontenttype" : "application/cloudevents+json", "data" : {"status": "completed"}}'
+```
+{{% /codetab %}}
+
+{{% codetab %}}
+Publish a custom CloudEvent to the `deathStarStatus` topic:
+```powershell
+Invoke-RestMethod -Method Post -ContentType 'application/cloudevents+json' -Body '{"specversion" : "1.0", "type" : "com.dapr.cloudevent.sent", "source" : "testcloudeventspubsub", "subject" : "Cloud Events Test", "id" : "someCloudEventId", "time" : "2021-08-02T09:00:00Z", "datacontenttype" : "application/cloudevents+json", "data" : {"status": "completed"}}' -Uri 'http://localhost:3500/v1.0/publish/pubsub/deathStarStatus'
+```
+{{% /codetab %}}
+
+{{< /tabs >}}
+
 ## Next steps
 
 - Try the [Pub/Sub quickstart sample](https://github.com/dapr/quickstarts/tree/master/pub-sub)

daprdocs/content/en/getting-started/_index.md

@@ -11,7 +11,6 @@ Welcome to the Dapr getting started guide!
 
 {{% alert title="Dapr Concepts" color="primary" %}}
 If you are looking for an introductory overview of Dapr and learn more about basic Dapr terminology, it is recommended to visit the [concepts section]({{<ref concepts>}}).
-{{< button text="Learn more" page="concepts" >}}
 {{% /alert %}}
 
 This guide will walk you through a series of steps to install, initialize and start using Dapr. The recommended way to get started with Dapr is to setup a local development environment (also referred to as [_self-hosted_ mode]({{< ref self-hosted >}})) which includes the Dapr CLI, Dapr sidecar binaries, and some default components that can help you start using Dapr quickly.

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

@@ -49,14 +49,26 @@ Then proceed with the `dapr upgrade --runtime-version {{% dapr-latest-version lo
 
 From version 1.0.0 onwards, upgrading Dapr using Helm is no longer a disruptive action since existing certificate values will automatically be re-used.
 
-1. Upgrade Dapr from 1.0.0 (or newer) to any [NEW VERSION] > v1.0.0:
+1. Upgrade Dapr from 1.0.0 (or newer) to any [NEW VERSION] > 1.0.0:
+
+   *Helm does not handle upgrading CRDs, so you need to perform that manually. CRDs are backward-compatible and should only be installed forward.*
+
+   >Note: The Dapr version is included in the commands below.
+
+   For version {{% dapr-latest-version long="true" %}}:
+
+   ```bash
+   kubectl replace -f https://raw.githubusercontent.com/dapr/dapr/v{{% dapr-latest-version long="true" %}}/charts/dapr/crds/components.yaml
+   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
+   ```
 
    ```bash
    helm repo update
    ```
 
    ```bash
-   helm upgrade dapr dapr/dapr --version [NEW VERSION] --namespace dapr-system --wait
+   helm upgrade dapr dapr/dapr --version {{% dapr-latest-version long="true" %}} --namespace dapr-system --wait
    ```
    *If you're using a values file, remember to add the `--values` option when running the upgrade command.*
 

daprdocs/content/en/reference/components-reference/supported-bindings/blobstorage.md

@@ -32,6 +32,8 @@ spec:
     value: <bool>
   - name: getBlobRetryCount
     value: <integer>
+  - name: publicAccessLevel
+    value: <publicAccessLevel>
 ```
 {{% alert title="Warning" color="warning" %}}
 The above example uses secrets as plain strings. It is recommended to use a secret store for the secrets as described [here]({{< ref component-secrets.md >}}).
@@ -46,6 +48,7 @@ The above example uses secrets as plain strings. It is recommended to use a secr
 | container | Y | Output | The name of the Blob Storage container to write to | `myexamplecontainer` |
 | decodeBase64 | N | Output | Configuration to decode base64 file content before saving to Blob Storage. (In case of saving a file with binary content). `true` is the only allowed positive value. Other positive variations like `"True", "1"` are not acceptable. Defaults to `false` | `true`, `false` |
 | getBlobRetryCount | N | Output | Specifies the maximum number of HTTP GET requests that will be made while reading from a RetryReader Defaults to `10` | `1`, `2`
+| publicAccessLevel | N | Output | Specifies whether data in the container may be accessed publicly and the level of access (only used if the container is created by Dapr). Defaults to `none` | `blob`, `container`, `none` 
 
 
 ## Binding support

daprdocs/content/en/reference/components-reference/supported-bindings/kubernetes-binding.md

@@ -25,7 +25,7 @@ spec:
   - name: namespace
     value: <NAMESPACE>
   - name: resyncPeriodInSec
-    vale: "<seconds>"
+    value: "<seconds>"
 ```
 
 ## Spec metadata fields

daprdocs/content/en/reference/components-reference/supported-state-stores/setup-firestore.md

@@ -65,7 +65,7 @@ The above example uses secrets as plain strings. It is recommended to use a secr
 | client_x509_cert_url | Y      | The client certificate URL | `"https://www.googleapis.com/robot/v1/metadata/x509/x"`
 | entity_kind          | N      | The entity name in Filestore. Defaults to `"DaprState"` | `"DaprState"`
 
-## Setup GCP Firestone
+## Setup GCP Firestore
 
 {{< tabs "Self-Hosted" "Google Cloud" >}}
 

daprdocs/layouts/shortcodes/button.html

@@ -2,7 +2,8 @@
 {{ $page := .Get "page" }}
 {{ $link := .Get "link" | default "#" }}
 {{ $text := .Get "text" }}
+{{ $newtab := .Get "newtab" | default "false" }}
 
 {{- if $page -}}{{- $link = ref . $page -}}{{- end -}}
 
-<a class="btn btn-{{ $color }}" href="{{ $link }}" role="button">{{ $text }}</a>
+<a class="btn btn-{{ $color }}" href="{{ $link }}" role="button" {{- if eq $newtab "true" -}}target="_blank"{{- end -}}>{{ $text }}</a>