Skip to content

Commit 0318ef5

Browse files
authored
Merge branch 'v1.14' into endgame_v1.14-updates
2 parents 2d973d6 + 2050a85 commit 0318ef5

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

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: 5 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,9 @@ app.include_router(router)
540540
```
541541

542542
{{% /codetab %}}
543+
544+
{{< /tabs >}}
545+
543546
## Receiving message headers with special characters
544547

545548
The consumer application may be required to receive message headers that include special characters, which may cause HTTP protocol validation errors.

0 commit comments

Comments
 (0)