Merge branch 'v1.1' into v1.1_zh

This commit is contained in:
Newbe36524 2021-04-07 09:16:28 +08:00 committed by GitHub
commit 1d54ada066
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 20 additions and 18 deletions

View File

@ -53,7 +53,7 @@ dapr --version
Output should look like this:
```
CLI version: 1.1.0
Runtime version: 1.1.0
Runtime version: 1.1.1
```
### Step 4: Verify containers are running

View File

@ -142,6 +142,6 @@ Use the `AWS account ID` and `AWS account secret` and plug them into the `access
- [Pub/Sub building block]({{< ref pubsub >}})
- Read [this guide]({{< ref "howto-publish-subscribe.md#step-2-publish-a-topic" >}}) for instructions on configuring pub/sub components
- [AWS SQS as subscriber to SNS](https://docs.aws.amazon.com/sns/latest/dg/sns-sqs-as-subscriber.html)
- [AWS SNS API refernce](https://docs.aws.amazon.com/sns/latest/api/Welcome.html)
- [AWS SQS API refernce](https://docs.aws.amazon.com/AWSSimpleQueueService/latest/APIReference/Welcome.html)
- [AWS SNS API reference](https://docs.aws.amazon.com/sns/latest/api/Welcome.html)
- [AWS SQS API reference](https://docs.aws.amazon.com/AWSSimpleQueueService/latest/APIReference/Welcome.html)
- [Authenticating to AWS]({{< ref authenticating-aws.md >}})

View File

@ -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.0 \
--version=1.1.1 \
--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.0 \
--version=1.1.1 \
--namespace dapr-system \
--create-namespace \
--set global.ha.enabled=true \

View File

@ -16,6 +16,8 @@ When running a basic [Kubernetes Job](https://kubernetes.io/docs/concepts/worklo
When a job is finish without calling `Shutdown` your job will be in a `NotReady` state with only the `daprd` container running endlessly.
Be sure and use the *POST* HTTP verb when calling the shutdown API.
```yaml
apiVersion: batch/v1
kind: Job
@ -30,8 +32,8 @@ spec:
spec:
containers:
- name: job
image: busybox
command: ["/bin/sh", "-c", "sleep 20 && wget localhost:3500/v1.0/shutdown"]
image: alpine
command: ["/bin/sh", "-c", "apk --no-cache add curl && sleep 20 && curl -X POST localhost:3500/v1.0/shutdown"]
restartPolicy: Never
```
@ -57,4 +59,4 @@ func main() {
defer client.Shutdown()
// Job
}
```
```

View File

@ -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.0
## Upgrade existing cluster to 1.1.1
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.0:
The example below shows how to upgrade to version 1.1.1:
```bash
dapr upgrade -k --runtime-version=1.0.1
dapr upgrade -k --runtime-version=1.1.1
```
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.0 -k` command as above.
Then proceed with the `dapr upgrade --runtime-version 1.1.1 -k` command as above.
### Helm

View File

@ -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.0) with:
1. Ensure you are using the latest version of Dapr (v1.1.1) with:
```bash
$ dapr --version
CLI version: 1.1.0
Runtime version: 1.1.0
Runtime version: 1.1.1
```

View File

@ -33,7 +33,7 @@ The table below shows the versions of Dapr releases that have been tested togeth
|--------------------|:--------:|:--------|---------|---------|---------|
| Feb 17th 2021 | 1.0.0</br>| 1.0.0 | Java 1.0.0 </br>Go 1.0.0 </br>PHP 1.0.0 </br>Python 1.0.0 </br>.NET 1.0.0 | 0.6.0 | Supported |
| Mar 4th 2021 | 1.0.1</br>| 1.0.1 | Java 1.0.2 </br>Go 1.0.0 </br>PHP 1.0.0 </br>Python 1.0.0 </br>.NET 1.0.0 | 0.6.0 | Supported |
| Apr 1st 2021 | 1.1.0</br> | 1.1.0 | Java 1.0.2 </br>Go 1.1.0 </br>PHP 1.0.0 </br>Python 1.1.0 </br>.NET 1.1.0 | 0.6.0 | Supported (current) |
| Apr 1st 2021 | 1.1.1</br> | 1.1.0 | Java 1.0.2 </br>Go 1.1.0 </br>PHP 1.0.0 </br>Python 1.1.0 </br>.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
@ -45,7 +45,7 @@ The table below shows the tested upgrade paths for the Dapr runtime. For example
| 0.11 | N/A | 1.0.1 | Use Dapr CLI to upgrade for both self hosted and Kubernetes
| | 1.0.1| 1.1.0 |
| 1.0-rc1 to 1.0-rc4 | N/A | 1.0.1 | See Dapr 1.0 release notes
| 1.0.0 or 1.0.1 | N/A | 1.1.0 | See Dapr 1.1 release notes
| 1.0.0 or 1.0.1 | N/A | 1.1.1 | See Dapr 1.1 release notes
## Feature and deprecations
There is a process for announcing feature deprecations. Deprecations are applied two (2) releases after the release in which they were announced. For example Feature X is announced to be deprecated in the 1.0.0 release notes and will then be removed in 1.2.0.

View File

@ -36,12 +36,12 @@ dapr upgrade -k
### Upgrade specified version of Dapr runtime in Kubernetes
```bash
dapr upgrade -k --runtime-version 1.1.0
dapr upgrade -k --runtime-version 1.1.1
```
### Upgrade specified version of Dapr runtime in Kubernetes with value set
```bash
dapr upgrade -k --runtime-version 1.1.0 --set global.logAsJson=true
dapr upgrade -k --runtime-version 1.1.1 --set global.logAsJson=true
```
# Related links