Merge branch 'v1.11' into issue_3258

dapr · Jun 19, 2023 · 10e4e50 · 10e4e50
2 parents 7998e1f + 3e15220
commit 10e4e50
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/.github/workflows/website-root.yml b/.github/workflows/website-root.yml
@@ -61,6 +61,7 @@ jobs:
           api_location: "daprdocs/public/" 
           output_location: ""
           skip_app_build: true
+          skip_deploy_on_missing_secrets: true
       - name: Upload Hugo artifacts
         uses: actions/upload-artifact@v3
         with:

diff --git a/daprdocs/content/en/reference/components-reference/supported-bindings/kafka.md b/daprdocs/content/en/reference/components-reference/supported-bindings/kafka.md
@@ -39,6 +39,8 @@ spec:
     secretKeyRef:
       name: kafka-secrets
       key: saslPasswordSecret
+  - name: saslMechanism
+    value: "SHA-512"
   - name: initialOffset # Optional. Used for input bindings.
     value: "newest"
   - name: maxMessageBytes # Optional.
@@ -61,6 +63,7 @@ spec:
 | authType            | Y | Input/Output | Configure or disable authentication. Supported values: `none`, `password`, `mtls`, or `oidc` | `"password"`, `"none"` |
 | saslUsername | N | Input/Output | The SASL username used for authentication. Only required if `authRequired` is set to `"true"`. | `"adminuser"` |
 | saslPassword | N | Input/Output | The SASL password used for authentication. Can be `secretKeyRef` to use a [secret reference]({{< ref component-secrets.md >}}). Only required if `authRequired` is set to `"true"`. | `""`, `"KeFg23!"` |
+| saslMechanism | N | Input/Output | The SASL authentication mechanism you'd like to use. Only required if `authtype` is set to `"password"`. If not provided, defaults to `PLAINTEXT`, which could cause a break for some services, like Amazon Managed Service for Kafka. | `"SHA-512", "SHA-256", "PLAINTEXT"` |
 | initialOffset   | N | Input | The initial offset to use if no offset was previously committed. Should be "newest" or "oldest". Defaults to "newest". | `"oldest"` |
 | maxMessageBytes | N | Input/Output | The maximum size in bytes allowed for a single Kafka message. Defaults to 1024. | `2048` |
 | oidcTokenEndpoint | N | Input/Output | Full URL to an OAuth2 identity provider access token endpoint. Required when `authType` is set to `oidc` | "https://identity.example.com/v1/token" |