Merge pull request #1287 from dapr/upmerge-v1.1

Upmerge v1.1
This commit is contained in:
Ori Zohar 2021-03-04 10:34:33 -08:00 committed by GitHub
commit addaddaf5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 28 additions and 18 deletions

3
.gitmodules vendored
View File

@ -7,3 +7,6 @@
[submodule "sdkdocs/php"]
path = sdkdocs/php
url = https://github.com/dapr/php-sdk.git
[submodule "sdkdocs/dotnet"]
path = sdkdocs/dotnet
url = https://github.com/dapr/dotnet-sdk.git

View File

@ -46,6 +46,12 @@ id = "UA-149338238-3"
[[module.mounts]]
source = "../sdkdocs/php/daprdocs/content/en/php-sdk-docs"
target = "content/developing-applications/sdks/php"
[[module.mounts]]
source = "../sdkdocs/dotnet/daprdocs/content/en/dotnet-sdk-docs"
target = "content/developing-applications/sdks/dotnet"
[[module.mounts]]
source = "../sdkdocs/dotnet/daprdocs/content/en/dotnet-sdk-contributing"
target = "content/contributing/"
# Markdown Engine - Allow inline html
[markup]

View File

@ -77,7 +77,7 @@ Welcome to the Dapr documentation site!
<h5 class="mt-0"><b>Language SDKs</b></h5>
<p>Create Dapr applications in your preferred language using the Dapr SDKs.</p>
<div class="media mt-3">
<a class="pr-3" href="{{< ref sdks >}}">
<a class="pr-3" href="{{< ref dotnet >}}">
<img src="/images/homepage/dotnet.png" alt=".NET logo" width=30>
</a>
<div class="media-body">
@ -109,7 +109,7 @@ Welcome to the Dapr documentation site!
</div>
</div>
<div class="media mt-3">
<a class="pr-4" href="{{< ref sdks >}}">
<a class="pr-4" href="{{< ref php >}}">
<img src="/images/homepage/php.png" alt="PHP logo" width=30>
</a>
<div class="media-body">

View File

@ -50,7 +50,7 @@ The diagram below shows how the Sentry system service issues certificates for ap
<img src="/images/security-mTLS-sentry-selfhosted.png" width=1000>
### mTLS in Kubernetes
The diagram below shows how the Sentry system service issues certificates for applications based on the root/issuer certificate that is provided by an operator or generated by the Sentry service as stored as a Kubernetes secret
The diagram below shows how the Sentry system service issues certificates for applications based on the root/issuer certificate that is provided by an operator or generated by the Sentry service and stored as a Kubernetes secret
<img src="/images/security-mTLS-sentry-kubernetes.png" width=1000>

View File

@ -18,7 +18,7 @@ The Dapr SDKs are the easiest way for you to get Dapr into your application. Cho
- Interact with external resources through input and output [bindings]({{< ref bindings >}})
- Get [secrets]({{< ref secrets >}}) from secret stores
- Interact with [virtual actors]({{< ref actors >}})
- **Service extensions**: The Dapr service extensions allow you to create services that can:
- **Server extensions**: The Dapr service extensions allow you to create services that can:
- Be [invoked]({{< ref service-invocation >}}) by other services
- [Subscribe]({{< ref pubsub >}}) to topics
- **Actor SDK**: The Dapr Actor SDK allows you to build virtual actors with:
@ -29,13 +29,13 @@ The Dapr SDKs are the easiest way for you to get Dapr into your application. Cho
## SDK languages
| Language | Status | Client SDK | Service Extensions | Actor SDK |
|----------|:-----:|:----------:|:-----------:|:---------:|
| [.NET](https://github.com/dapr/dotnet-sdk) | Stable | ✔ | ✔ </br>ASP.NET Core | ✔ |
| [Python]({{< ref python >}}) | Stable | ✔ | </br>[gRPC]({{< ref python-grpc.md >}}) | ✔ </br>[FastAPI]({{< ref python-fastapi.md >}})<br />[Flask]({{< ref python-flask.md >}}) |
| [Java](https://github.com/dapr/java-sdk) | Stable | ✔ | </br>Spring Boot | ✔ |
| Language | Status | Client SDK | Server extensions | Actor SDK |
|----------|:------|:----------:|:-----------:|:---------:|
| [.NET]({{< ref dotnet >}}) | Stable | ✔ | [ASP.NET Core]({{< ref dotnet-aspnet >}}) | ✔ |
| [Python]({{< ref python >}}) | Stable | ✔ | [gRPC]({{< ref python-grpc.md >}}) | [FastAPI]({{< ref python-fastapi.md >}})<br />[Flask]({{< ref python-flask.md >}}) |
| [Java](https://github.com/dapr/java-sdk) | Stable | ✔ | Spring Boot | ✔ |
| [Go](https://github.com/dapr/go-sdk) | Stable | ✔ | ✔ | |
| [PHP](https://github.com/dapr/php-sdk) | Stable | ✔ | ✔ | ✔ |
| [PHP]({{< ref php >}}) | Stable | ✔ | ✔ | ✔ |
| [C++](https://github.com/dapr/cpp-sdk) | In development | ✔ | |
| [Rust]() | In development | ✔ | | |
| [Javascript]() | In development| ✔ | |

View File

@ -19,7 +19,7 @@ Run the following command to launch a Dapr sidecar that will listen on port 3500
dapr run --app-id myapp --dapr-http-port 3500
```
With this command, no custom component folder was defined so the Dapr uses the default component definitions that were created during the init flow (these can be found under `$HOME/.dapr/components` on Linux or MacOS and under `%USERPROFILE%\.dapr\components` on Windows). These tell Dapr to the local Redis Docker container as a state store and message broker.
With this command, no custom component folder was defined, so Dapr uses the default component definitions that were created during the init flow (these can be found under `$HOME/.dapr/components` on Linux or MacOS and under `%USERPROFILE%\.dapr\components` on Windows). These tell Dapr to use the local Redis Docker container as a state store and message broker.
## Step 2: Save state

View File

@ -86,8 +86,8 @@ Invoke-RestMethod -Uri 'http://localhost:3500/v1.0/secrets/my-secret-store/my-se
You should see output with the secret you stored in the JSON file.
```
"I'm Batman"
```json
{"my-secret":"I'm Batman"}
```
<a class="btn btn-primary" href="{{< ref quickstarts.md >}}" role="button">Next step: Explore Dapr quickstarts >></a>

View File

@ -121,7 +121,7 @@ metadata:
rules:
- apiGroups: [""]
resources: ["secrets"]
verbs: ["get"]
verbs: ["get", "list"]
---
kind: RoleBinding

View File

@ -78,7 +78,7 @@ The above example uses secrets as plain strings. It is recommended to use a secr
You can run a NATS server locally using Docker:
```bash
docker run -d -name nats-streaming -p 4222:4222 -p 8222:8222 nats-streaming
docker run -d --name nats-streaming -p 4222:4222 -p 8222:8222 nats-streaming
```
You can then interact with the server using the client port: `localhost:4222`.

View File

@ -64,7 +64,7 @@ Run an instance of MySQL. You can run a local instance of MySQL in Docker CE wit
This example does not describe a production configuration because it sets the password in plain text and the user name is left as the MySQL default of "root".
```bash
docker run --name dapr_mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=my-secret-pw -d mysql:latest
docker run --name dapr-mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=my-secret-pw -d mysql:latest
```
{{% /codetab %}}
@ -78,7 +78,7 @@ We can use [Helm](https://helm.sh/) to quickly create a MySQL instance in our Ku
```bash
helm repo add bitnami https://charts.bitnami.com/bitnami
helm install dapr_mysql bitnami/mysql
helm install dapr-mysql bitnami/mysql
```
1. Run `kubectl get pods` to see the MySQL containers now running in your cluster.

View File

@ -21,7 +21,7 @@ Use the following resource settings might serve as a starting point. Requirement
| Placement | Limit: 1, Request: 250m | Limit: 150Mi, Request: 75Mi
| Dashboard | Limit: 200m, Request: 50m | Limit: 200Mi, Request: 20Mi
When installing Dapr using Helm, no default limit/request values are set. Each component has a `resources` option (for example, `dapr_dashboard.resources`), which you can use to tune the Dapr control plane to fit your environment. The [Helm chart readme](https://github.com/dapr/dapr/blob/master/charts/dapr/README) has detailed information and examples. For local/dev installations, you might simply want to skip configuring the `resources` options.
When installing Dapr using Helm, no default limit/request values are set. Each component has a `resources` option (for example, `dapr_dashboard.resources`), which you can use to tune the Dapr control plane to fit your environment. The [Helm chart readme](https://github.com/dapr/dapr/blob/master/charts/dapr/README.md) has detailed information and examples. For local/dev installations, you might simply want to skip configuring the `resources` options.
### Optional components

1
sdkdocs/dotnet Submodule

@ -0,0 +1 @@
Subproject commit 5f5326b83fa52fe1965f60f2161eb18b2940cc10