Skip to content

Commit

Permalink
consistency check
Browse files Browse the repository at this point in the history
Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
  • Loading branch information
hhunter-ms committed Aug 24, 2023
1 parent b9b8ac4 commit aaa2f24
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 9 deletions.
Expand Up @@ -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:

Expand Down
Expand Up @@ -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 |
Expand Down Expand Up @@ -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/).
Expand Down
Expand Up @@ -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
Expand Down
Expand Up @@ -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
Expand Down
Expand Up @@ -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

Expand Down Expand Up @@ -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.

Expand Down

0 comments on commit aaa2f24

Please sign in to comment.