Skip to content

Upmerge 02/25 #4555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Feb 26, 2025
Merged

Upmerge 02/25 #4555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2cfc002
update self-hosted-with-docker docs
Feb 8, 2025
dea27c7
Merge pull request #4518 from fvanzee/self-hosted-scheduler-docs
hhunter-ms Feb 12, 2025
27683a6
Update deprecated exporter (#4543)
vdamov Feb 15, 2025
9c73435
docs: also restart sidecar-injector
Feb 17, 2025
0a2ff1d
Update daprdocs/content/en/operations/security/mtls.md
jfreeland Feb 18, 2025
5a9915b
Update mtls.md
msfussell Feb 20, 2025
9009243
update kafka bulk metadata options
Gallardot Feb 22, 2025
b7907d6
fix missing tabs end
Gallardot Feb 22, 2025
80079dc
Merge pull request #4552 from Gallardot/patch-2
hhunter-ms Feb 24, 2025
a910921
Merge branch 'v1.14' into patch-1
hhunter-ms Feb 24, 2025
482f2ba
Merge pull request #4551 from Gallardot/patch-1
hhunter-ms Feb 24, 2025
5205bd7
Merge branch 'v1.14' into chore/sidecar-injector
msfussell Feb 25, 2025
2050a85
Merge pull request #4544 from jfreeland/chore/sidecar-injector
hhunter-ms Feb 25, 2025
574d5ef
resolve conflict
hhunter-ms Feb 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion daprdocs/content/en/operations/hosting/self-hosted/self-hosted-with-docker.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ services:
- type: tmpfs
target: /data
tmpfs:
size: "10000"
size: "64m"

networks:
hello-dapr: null
Expand Down
15 changes: 9 additions & 6 deletions daprdocs/content/en/operations/security/mtls.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,8 @@ kubectl rollout restart -n <DAPR_NAMESPACE> deployment/dapr-sentry
```bash
kubectl rollout restart deploy/dapr-operator -n <DAPR_NAMESPACE>
kubectl rollout restart statefulsets/dapr-placement-server -n <DAPR_NAMESPACE>
kubectl rollout restart deploy/dapr-sidecar-injector -n <DAPR_NAMESPACE>
kubectl rollout restart deploy/dapr-scheduler-server -n <DAPR_NAMESPACE>
```

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

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

Expand Down
5 changes: 3 additions & 2 deletions ...ontent/en/reference/components-reference/supported-pubsub/setup-apache-kafka.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,8 +459,8 @@ Apache Kafka supports the following bulk metadata options:

| Configuration | Default |
|----------|---------|
| `maxBulkAwaitDurationMs` | `10000` (10s) |
| `maxBulkSubCount` | `80` |
| `maxAwaitDurationMs` | `10000` (10s) |
| `maxMessagesCount` | `80` |

## Per-call metadata fields

Expand Down Expand Up @@ -540,6 +540,7 @@ app.include_router(router)
```

{{% /codetab %}}

{{< /tabs >}}

## Receiving message headers with special characters
Expand Down
4 changes: 2 additions & 2 deletions daprdocs/static/docs/open-telemetry-collector/open-telemetry-collector-jaeger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ data:
zpages:
endpoint: :55679
exporters:
logging:
loglevel: debug
debug:
verbosity: detailed
# Depending on where you want to export your trace, use the
# correct OpenTelemetry trace exporter here.
#
Expand Down
Loading