dapr
/
docs
mirror of https://github.com/dapr/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

consistency check 

Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
This commit is contained in:
Hannah Hunter 2023-08-24 10:18:44 -04:00
parent b9b8ac4fe9
commit aaa2f246b5
5 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daprdocs/content/en/operations/configuration/configuration-overview.md
View File

@ -269,11 +269,11 @@ spec:
action: allow
```
## Control-plane configuration
## Control plane configuration
There is a single configuration file called `daprsystem` installed with the Dapr control plane system services that applies global settings. This is only set up when Dapr is deployed to Kubernetes.
### Control-plane configuration settings
### Control plane configuration settings
A Dapr control plane configuration contains the following sections:

4
daprdocs/content/en/operations/hosting/kubernetes/kubernetes-overview.md
View File

@ -6,8 +6,6 @@ weight: 10000
description: "Overview of how to get Dapr running on your Kubernetes cluster"
---
## Dapr on Kubernetes
Dapr can be configured to run on any supported versions of Kubernetes. To achieve this, Dapr begins by deploying the following Kubernetes services, which provide first-class integration to make running applications with Dapr easy.
| Kubernetes services | Description |
@ -47,7 +45,7 @@ For more information, check [Dapr annotations]({{< ref arguments-annotations-ove
Dapr works seamlessly with any user application container image, regardless of its origin. Simply [initialize Dapr]({{< ref install-dapr-selfhost.md >}}) and add the [Dapr annotations]({{< ref arguments-annotations-overview.md >}}) to your Kubernetes definition to add the Dapr sidecar.
The Dapr control-plane and sidecar images come from the [daprio Docker Hub](https://hub.docker.com/u/daprio) container registry, which is a public registry.
The Dapr control plane and sidecar images come from the [daprio Docker Hub](https://hub.docker.com/u/daprio) container registry, which is a public registry.
For information about:
- Pulling your application images from a private registry, reference the [official Kubernetes documentation](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/).

2
daprdocs/content/en/operations/hosting/self-hosted/self-hosted-with-docker.md
View File

@ -16,7 +16,7 @@ This article provides guidance on running Dapr with Docker on a Windows/Linux/ma
## Initialize Dapr environment
To initialize the Dapr control-plane containers and create a default configuration file, run:
To initialize the Dapr control plane containers and create a default configuration file, run:
```bash
dapr init

2
daprdocs/content/en/operations/hosting/self-hosted/self-hosted-with-podman.md
View File

@ -15,7 +15,7 @@ This article provides guidance on running Dapr with Podman on a Windows/Linux/ma
## Initialize Dapr environment
To initialize the Dapr control-plane containers and create a default configuration file, run:
To initialize the Dapr control plane containers and create a default configuration file, run:
```bash
dapr init --container-runtime podman

4
daprdocs/content/en/reference/resource-specs/configuration-schema.md
View File

@ -6,7 +6,7 @@ description: "The basic spec for a Dapr Configuration resource"
weight: 5000
---
The `Configuration` is a Dapr resource that is used to configure the Dapr sidecar, control-plane, and others.
The `Configuration` is a Dapr resource that is used to configure the Dapr sidecar, control plane, and others.
## Sidecar format
@ -76,7 +76,7 @@ spec:
| tracing | N | Turns on tracing for an application. | [Learn more about the `tracing` configuration.]({{< ref "configuration-overview.md#tracing" >}}) |
## Control-plane format
## Control plane format
The `daprsystem` configuration file installed with Dapr applies global settings and is only set up when Dapr is deployed to Kubernetes.