Merge pull request #272408 from ryanwinterms/dapr-install-update

update yaml to support dapr 1.12/1.13 in AIO

Author: prmerger-automator[bot]

articles/iot-operations/develop/howto-deploy-dapr.md

@@ -33,12 +33,9 @@ To install the Dapr runtime, use the following Helm command:
 ```bash
 helm repo add dapr https://dapr.github.io/helm-charts/
 helm repo update
-helm upgrade --install dapr dapr/dapr --version=1.11 --namespace dapr-system --create-namespace --wait
+helm upgrade --install dapr dapr/dapr --version=1.13 --namespace dapr-system --create-namespace --wait
 ```
 
-> [!IMPORTANT]
-> **Dapr v1.12** is currently not supported.
-
 ## Register MQ pluggable components
 
 To register MQ's pluggable pub/sub and state management components, create the component manifest yaml, and apply it to your cluster. 
@@ -49,7 +46,8 @@ To create the yaml file, use the following component definitions:
 > | Component | Description |
 > |-|-|
 > | `metadata.name` | The component name is important and is how a Dapr application references the component. |
-> | `spec.type` | [The type of the component](https://docs.dapr.io/operations/components/pluggable-components-registration/#define-the-component), which must be declared exactly as shown. It tells Dapr what kind of component (`pubsub` or `state`) it is and which Unix socket to use.  |
+> | `metadata.annotations` | Component annotations used by the Dapr sidecar injector
+> | `spec.type` | [The type of the component](https://docs.dapr.io/operations/components/pluggable-components-registration/#define-the-component), which must be declared exactly as shown. It tells Dapr what kind of component (`pubsub` or `state`) it is and which Unix socket to use. |
 > | `spec.metadata.url` | The URL tells the component where the local MQ endpoint is. Defaults to `8883` is MQ's default MQTT port with TLS enabled. |
 > | `spec.metadata.satTokenPath` | The Service Account Token is used to authenticate the Dapr components with the MQTT broker |
 > | `spec.metadata.tlsEnabled` |  Define if TLS is used by the MQTT broker. Defaults to `true` |
@@ -65,6 +63,22 @@ To create the yaml file, use the following component definitions:
     metadata:
       name: aio-mq-pubsub
       namespace: azure-iot-operations
+      annotations:
+        dapr.io/component-container: >
+          {
+            "name": "aio-mq-components",
+            "image": "ghcr.io/azure/iot-mq-dapr-components:latest",
+            "volumeMounts": [
+              {
+                "name": "mqtt-client-token",
+                "mountPath": "/var/run/secrets/tokens"
+              },
+              {
+                "name": "aio-ca-trust-bundle",
+                "mountPath": "/var/run/certs/aio-mq-ca-cert"
+              }
+            ]
+          }
     spec:
       type: pubsub.aio-mq-pubsub-pluggable # DO NOT CHANGE
       version: v1
@@ -77,15 +91,29 @@ To create the yaml file, use the following component definitions:
         value: true
       - name: caCertPath
         value: "/var/run/certs/aio-mq-ca-cert/ca.crt"
-      - name: logLevel
-        value: "Info"
     ---
     # State Management component
     apiVersion: dapr.io/v1alpha1
     kind: Component
     metadata:
       name: aio-mq-statestore
       namespace: azure-iot-operations
+      annotations:
+        dapr.io/component-container: >
+          {
+            "name": "aio-mq-components",
+            "image": "ghcr.io/azure/iot-mq-dapr-components:latest",
+            "volumeMounts": [
+              {
+                "name": "mqtt-client-token",
+                "mountPath": "/var/run/secrets/tokens"
+              },
+              {
+                "name": "aio-ca-trust-bundle",
+                "mountPath": "/var/run/certs/aio-mq-ca-cert"
+              }
+            ]
+          }
     spec:
       type: state.aio-mq-statestore-pluggable # DO NOT CHANGE
       version: v1
@@ -98,8 +126,6 @@ To create the yaml file, use the following component definitions:
         value: true
       - name: caCertPath
         value: "/var/run/certs/aio-mq-ca-cert/ca.crt"
-      - name: logLevel
-        value: "Info"
     ```
 
 1. Apply the component yaml to your cluster by running the following command:

articles/iot-operations/develop/howto-develop-dapr-apps.md

@@ -50,13 +50,14 @@ After you finish writing the Dapr application, build the container:
 
 ## Deploy a Dapr application
 
-The following [Deployment](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/) definition defines the different volumes required to deploy the application along with the required containers.
+The following [Deployment](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/) definition contains the volumes required to deploy the application along with the required containers. This deployment utilizes the Dapr sidecar injector to automatically add the pluggable component pod.
 
-To start, create a yaml file with the following definitions:
+The yaml contains both a ServiceAccount, used to generate SATs for authentication with IoT Mq and the Dapr application Deployment.
+
+To create the yaml file, use the following definitions:
 
 > | Component | Description |
 > |-|-|
-> | `volumes.dapr-unix-domain-socket` | A shared directory to host unix domain sockets used to communicate between the Dapr sidecar and the pluggable components |
 > | `volumes.mqtt-client-token` | The System Authentication Token used for authenticating the Dapr pluggable components with the IoT MQ broker |
 > | `volumes.aio-ca-trust-bundle` | The chain of trust to validate the MQTT broker TLS cert. This defaults to the test certificate deployed with Azure IoT Operations |
 > | `containers.mq-dapr-app` | The Dapr application container you want to deploy |
@@ -88,17 +89,14 @@ To start, create a yaml file with the following definitions:
             app: mq-dapr-app
           annotations:
             dapr.io/enabled: "true"
-            dapr.io/unix-domain-socket-path: "/tmp/dapr-components-sockets"
+            dapr.io/inject-pluggable-components: "true"
             dapr.io/app-id: "mq-dapr-app"
             dapr.io/app-port: "6001"
             dapr.io/app-protocol: "grpc"
         spec:
           serviceAccountName: dapr-client
 
           volumes:
-          - name: dapr-unix-domain-socket
-            emptyDir: {}
-
           # SAT token used to authenticate between Dapr and the MQTT broker
           - name: mqtt-client-token
             projected:
@@ -117,17 +115,6 @@ To start, create a yaml file with the following definitions:
           # Container for the Dapr application 
           - name: mq-dapr-app
             image: <YOUR_DAPR_APPLICATION>
-
-          # Container for the pluggable component
-          - name: aio-mq-components
-            image: ghcr.io/azure/iot-mq-dapr-components:latest
-            volumeMounts:
-            - name: dapr-unix-domain-socket
-              mountPath: /tmp/dapr-components-sockets
-            - name: mqtt-client-token
-              mountPath: /var/run/secrets/tokens
-            - name: aio-ca-trust-bundle
-              mountPath: /var/run/certs/aio-mq-ca-cert/
     ```
 
 2. Deploy the component by running the following command:

articles/iot-operations/develop/tutorial-event-driven-with-dapr.md

@@ -40,7 +40,6 @@ To start, create a yaml file that uses the following definitions:
 
 | Component | Description |
 |-|-|
-| `volumes.dapr-unit-domain-socket` | The socket file used to communicate with the Dapr sidecar |
 | `volumes.mqtt-client-token` | The SAT used for authenticating the Dapr pluggable components with the MQ broker and State Store |
 | `volumes.aio-mq-ca-cert-chain` | The chain of trust to validate the MQTT broker TLS cert |
 | `containers.mq-event-driven` | The prebuilt Dapr application container. | 
@@ -72,17 +71,14 @@ To start, create a yaml file that uses the following definitions:
             app: mq-event-driven-dapr
           annotations:
             dapr.io/enabled: "true"
-            dapr.io/unix-domain-socket-path: "/tmp/dapr-components-sockets"
+            dapr.io/inject-pluggable-components: "true"
             dapr.io/app-id: "mq-event-driven-dapr"
             dapr.io/app-port: "6001"
             dapr.io/app-protocol: "grpc"
         spec:
           serviceAccountName: dapr-client
 
           volumes:
-          - name: dapr-unix-domain-socket
-            emptyDir: {}
-
           # SAT token used to authenticate between Dapr and the MQTT broker
           - name: mqtt-client-token
             projected:
@@ -98,20 +94,8 @@ To start, create a yaml file that uses the following definitions:
               name: aio-ca-trust-bundle-test-only
 
           containers:
-          # Container for the dapr quickstart application 
           - name: mq-event-driven-dapr
             image: ghcr.io/azure-samples/explore-iot-operations/mq-event-driven-dapr:latest
-
-          # Container for the pluggable component
-          - name: aio-mq-components
-            image: ghcr.io/azure/iot-mq-dapr-components:latest
-            volumeMounts:
-            - name: dapr-unix-domain-socket
-              mountPath: /tmp/dapr-components-sockets
-            - name: mqtt-client-token
-              mountPath: /var/run/secrets/tokens
-            - name: aio-ca-trust-bundle
-              mountPath: /var/run/certs/aio-mq-ca-cert/
     ```
 
 1. Deploy the application by running the following command:
@@ -131,7 +115,7 @@ To start, create a yaml file that uses the following definitions:
     ```output
     NAME                          READY   STATUS              RESTARTS   AGE
     ...
-    mq-event-driven-dapr          4/4     Running             0          30s
+    mq-event-driven-dapr          3/3     Running             0          30s
     ```