Merge branch 'v1.9' into msi-wingetinstaller

This commit is contained in:
greenie-msft 2022-10-06 15:56:08 -07:00 committed by GitHub
commit 8e22bceee9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 12 deletions

View File

@ -34,6 +34,7 @@ dapr init [flags]
| `--namespace`, `-n` | | `dapr-system` | The Kubernetes namespace to install Dapr in |
| `--network` | | | The Docker network on which to install and deploy the Dapr runtime |
| `--runtime-version` | | `latest` | The version of the Dapr runtime to install, for example: `1.0.0` |
| `--image-variant` | | | The image variant to use for the Dapr runtime, for example: `mariner` |
| `--set` | | | Configure options on the command line to be passed to the Dapr Helm chart and the Kubernetes cluster upon install. Can specify multiple values in a comma-separated list, for example: `key1=val1,key2=val2` |
| `--slim`, `-s` | | `false` | Exclude placement service, Redis and Zipkin containers from self-hosted installation |
| `--timeout` | | `300` | The wait timeout for the Kubernetes installation |
@ -59,6 +60,12 @@ You can also specify a specific runtime version. Be default, the latest version
dapr init --runtime-version 1.4.0
```
You can also install Dapr with a particular image variant, for example: [mariner]({{< ref "kubernetes-deploy.md#using-mariner-based-images" >}}).
```bash
dapr init --image-variant mariner
```
Dapr can also run [Slim self-hosted mode]({{< ref self-hosted-no-docker.md >}}) without Docker.
```bash

View File

@ -36,18 +36,25 @@ The above example uses secrets as plain strings. It is recommended to use a secr
{{% /alert %}}
## Spec metadata fields
| Field | Required | Details | Example |
|--------------------|:--------:|--------|---------|
| accessKey | N | Access Key (Username) | `"admin"`
| secretKey | N | Secret Key (Password) | `"password"`
| nameServer | N | Name server address | `"127.0.0.1:9876;127.0.0.2:9877"`
| nameServerDomain | N | Name server domain | `"https://my-app.net:8080/nsaddr"`
| nameSpace | N | Namespace of the producer/consumer | `"namespace"` |
| groupName | N | Producer group name for RocketMQ publishers | `"my_unique_group_name"` |
| consumerGroup | N | Consumer group name for RocketMQ subscribers| `"my_unique_group_name"`
| content-type | N | Message content-type, e.g., `"application/cloudevents+json; charset=utf-8"`, `"application/octet-stream"` | `"text/plain"`
| retries | N | Number of times to retry to connect rocketmq's broker, optional | `0`
| sendTimeOut | N | Timeout duration for publishing a message in nanoseconds | `0`
| Field | Required | Details | Example |
| ---------------- | :------: | --------------------------------------------------------------------------------------------------------- | ---------------------------------- |
| accessKey | N | Access Key (Username) | `"admin"` |
| secretKey | N | Secret Key (Password) | `"password"` |
| nameServer | N | Name server address | `"127.0.0.1:9876;127.0.0.2:9877"` |
| nameServerDomain | N | Name server domain | `"https://my-app.net:8080/nsaddr"` |
| nameSpace | N | Namespace of the producer/consumer | `"namespace"` |
| producerGroup | N | Producer group name for RocketMQ publishers | `"my_unique_group_name"` |
| consumerGroup | N | Consumer group name for RocketMQ subscribers | `"my_unique_group_name"` |
| content-type | N | Message content-type, e.g., `"application/cloudevents+json; charset=utf-8"`, `"application/octet-stream"` | `"text/plain"` |
| retries | N | Number of times to retry to connect rocketmq's broker, optional | `0` |
| sendTimeOutSec | N | Timeout duration for publishing a message in seconds | `0` |
For backwards-compatibility reasons, the following values in the metadata are supported, although their use is discouraged.
| Field (supported but deprecated) | Required | Details | Example |
| -------------------------------- | :------: | -------------------------------------------------------- | ------------------------ |
| groupName | N | Producer group name for RocketMQ publishers | `"my_unique_group_name"` |
| sendTimeOut | N | Timeout duration for publishing a message in nanoseconds | `0` |
## Setup RocketMQ
See https://rocketmq.apache.org/docs/quick-start/ to setup a local RocketMQ instance.