Skip to content

Commit 61b82aa

Browse files
hhunter-msvdamovUncensoredJoey Freelandjfreeland
authored
Upmerge 02/25 (#4555)
* update self-hosted-with-docker docs Increase tmpfs size to prevent "no space left on device" error Signed-off-by: fvanzee <5238563+fvanzee@users.noreply.github.com> * Update deprecated exporter (#4543) Co-authored-by: Uncensored <Uncensored@DESKTOP-SVLGO47> * docs: also restart sidecar-injector Signed-off-by: Joey Freeland <joey@free.land> * Update daprdocs/content/en/operations/security/mtls.md Co-authored-by: Mark Fussell <markfussell@gmail.com> Signed-off-by: Joey Freeland <30938344+jfreeland@users.noreply.github.com> * Update mtls.md Updating the dapr init -k command Signed-off-by: Mark Fussell <markfussell@gmail.com> * update kafka bulk metadata options Signed-off-by: Gallardot <gallardot@apache.org> * fix missing tabs end Signed-off-by: Gallardot <gallardot@apache.org> --------- Signed-off-by: fvanzee <5238563+fvanzee@users.noreply.github.com> Signed-off-by: Joey Freeland <joey@free.land> Signed-off-by: Joey Freeland <30938344+jfreeland@users.noreply.github.com> Signed-off-by: Mark Fussell <markfussell@gmail.com> Signed-off-by: Gallardot <gallardot@apache.org> Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com> Co-authored-by: fvanzee <> Co-authored-by: Vladimir Damov <37113660+vdamov@users.noreply.github.com> Co-authored-by: Uncensored <Uncensored@DESKTOP-SVLGO47> Co-authored-by: Joey Freeland <joey.freeland@collins.com> Co-authored-by: Joey Freeland <30938344+jfreeland@users.noreply.github.com> Co-authored-by: Mark Fussell <markfussell@gmail.com> Co-authored-by: Gallardot <gallardot@apache.org>
1 parent 0a7a60f commit 61b82aa

File tree

4 files changed

+15
-11
lines changed

4 files changed

+15
-11
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ services:
149149
- type: tmpfs
150150
target: /data
151151
tmpfs:
152-
size: "10000"
152+
size: "64m"
153153

154154
networks:
155155
hello-dapr: null

daprdocs/content/en/operations/security/mtls.md

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,8 @@ kubectl rollout restart -n <DAPR_NAMESPACE> deployment/dapr-sentry
231231
```bash
232232
kubectl rollout restart deploy/dapr-operator -n <DAPR_NAMESPACE>
233233
kubectl rollout restart statefulsets/dapr-placement-server -n <DAPR_NAMESPACE>
234+
kubectl rollout restart deploy/dapr-sidecar-injector -n <DAPR_NAMESPACE>
235+
kubectl rollout restart deploy/dapr-scheduler-server -n <DAPR_NAMESPACE>
234236
```
235237

236238
4. Restart your Dapr applications to pick up the latest trust bundle.
@@ -332,12 +334,13 @@ Example:
332334
dapr status -k
333335

334336
NAME NAMESPACE HEALTHY STATUS REPLICAS VERSION AGE CREATED
335-
dapr-sentry dapr-system True Running 1 1.7.0 17d 2022-03-15 09:29.45
336-
dapr-dashboard dapr-system True Running 1 0.9.0 17d 2022-03-15 09:29.45
337-
dapr-sidecar-injector dapr-system True Running 1 1.7.0 17d 2022-03-15 09:29.45
338-
dapr-operator dapr-system True Running 1 1.7.0 17d 2022-03-15 09:29.45
339-
dapr-placement-server dapr-system True Running 1 1.7.0 17d 2022-03-15 09:29.45
340-
⚠ Dapr root certificate of your Kubernetes cluster expires in 2 days. Expiry date: Mon, 04 Apr 2022 15:01:03 UTC.
337+
dapr-operator dapr-system True Running 1 1.15.0 4m 2025-02-19 17:36.26
338+
dapr-placement-server dapr-system True Running 1 1.15.0 4m 2025-02-19 17:36.27
339+
dapr-dashboard dapr-system True Running 1 0.15.0 4m 2025-02-19 17:36.27
340+
dapr-sentry dapr-system True Running 1 1.15.0 4m 2025-02-19 17:36.26
341+
dapr-scheduler-server dapr-system True Running 3 1.15.0 4m 2025-02-19 17:36.27
342+
dapr-sidecar-injector dapr-system True Running 1 1.15.0 4m 2025-02-19 17:36.26
343+
⚠ Dapr root certificate of your Kubernetes cluster expires in 2 days. Expiry date: Mon, 04 Apr 2025 15:01:03 UTC.
341344
Please see docs.dapr.io for certificate renewal instructions to avoid service interruptions.
342345
```
343346

daprdocs/content/en/reference/components-reference/supported-pubsub/setup-apache-kafka.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -459,8 +459,8 @@ Apache Kafka supports the following bulk metadata options:
459459

460460
| Configuration | Default |
461461
|----------|---------|
462-
| `maxBulkAwaitDurationMs` | `10000` (10s) |
463-
| `maxBulkSubCount` | `80` |
462+
| `maxAwaitDurationMs` | `10000` (10s) |
463+
| `maxMessagesCount` | `80` |
464464

465465
## Per-call metadata fields
466466

@@ -540,6 +540,7 @@ app.include_router(router)
540540
```
541541

542542
{{% /codetab %}}
543+
543544
{{< /tabs >}}
544545

545546
## Receiving message headers with special characters

daprdocs/static/docs/open-telemetry-collector/open-telemetry-collector-jaeger.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ data:
1919
zpages:
2020
endpoint: :55679
2121
exporters:
22-
logging:
23-
loglevel: debug
22+
debug:
23+
verbosity: detailed
2424
# Depending on where you want to export your trace, use the
2525
# correct OpenTelemetry trace exporter here.
2626
#

0 commit comments

Comments
 (0)