acrolinx updates and yaml update

Signed-off-by: Ryan Winter <[email protected]>

Author: ryanwinter

articles/iot-operations/create-edge-apps/howto-develop-mqttnet-apps.md

@@ -33,32 +33,28 @@ The [sample code](https://github.com/Azure-Samples/explore-iot-operations/tree/m
 ##3. The mounted token is used as the password with well-known username `K8S-SAT`:
 
     ```csharp
-    static string token_path = "/var/run/secrets/tokens/mqtt-client-token";
+    static string sat_auth_file = "/var/run/secrets/tokens/mqtt-client-token";
     ...
-
-    // Read SAT Token
-    var satToken = File.ReadAllText(token_path);
+    var satToken = File.ReadAllBytes(sat_auth_file);
     ```
 
 1. The MQTT client options are configured using the `MqttClientOptions` class. Using the `MqttClientOptionsBuilder` as advised in the [client](https://github.com/dotnet/MQTTnet/wiki/Client) documentation is the advised way of setting the options:
 
     ```csharp
-    // Create TCP based options using the builder amd connect to broker
     var mqttClientOptions = new MqttClientOptionsBuilder()
-        .WithTcpServer(broker, 1883)
-        .WithProtocolVersion(MqttProtocolVersion.V311)
+        .WithTcpServer(hostname, tcp_port)
+        .WithProtocolVersion(MqttProtocolVersion.V500)
         .WithClientId("mqtt-client-dotnet")
-        .WithCredentials("K8S-SAT", satToken);        
-        .Build();
+        .WithAuthentication("K8S-SAT", satToken);
     ```
 
-5. After setting up the MQTT client options, a connection can be established. The following code shows how to connect with a server. You can replace the *CancellationToken.None* with a valid *CancellationToken*, if needed.
+5. After setting up the MQTT client options, a connection can be established. The following code shows how to connect with a server. You can replace the `CancellationToken.None` with a valid CancellationToken if needed.
 
     ```csharp
-    var response = await mqttClient.ConnectAsync(mqttClientOptions, CancellationToken.None);
+    var response = await mqttClient.ConnectAsync(mqttClientOptions.Build(), CancellationToken.None);
     ```
 
-6. MQTT messages can be created using the properties directly or via using `MqttApplicationMessageBuilder`. This class has some useful overloads that allow dealing with different payload formats. The API of the builder is a fluent API. The following code shows how to compose an application message and publish them to an article called *sampletopic*:
+6. MQTT messages can be created using the properties directly or using `MqttApplicationMessageBuilder`. This class has overloads that allow dealing with different payload formats. The API of the builder is a fluent API. The following code shows how to compose an application message and publish them to an article called *sampletopic*:
 
     ```csharp
     var applicationMessage = new MqttApplicationMessageBuilder()
@@ -67,58 +63,65 @@ The [sample code](https://github.com/Azure-Samples/explore-iot-operations/tree/m
         .Build();
 
     await mqttClient.PublishAsync(applicationMessage, CancellationToken.None);
-    Console.WriteLine("The MQTT client published a message.");
     ```
 
 ## Pod specification
 
-The `serviceAccountName` field in the pod configuration must match the service account associated with the token being used. Also, note the `serviceAccountToken.expirationSeconds` is set to **86400 seconds**, and once it expires, you need to reload the token from disk. This logic isn't currently implemented in the sample.
+The `serviceAccountName` field in the pod configuration must match the service account associated with the token being used. Also, note the `serviceAccountToken.expirationSeconds` is set to **86400 seconds**, and once it expires, you need to reload the token from disk. This logic isn't implemented in this sample.
 
 ```yaml
 apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: mqtt-client
+  namespace: azure-iot-operations
+
+---
+apiVersion: v1
 kind: Pod
 metadata:
   name: mqtt-client-dotnet
-  labels:
-    app: publisher
+  namespace: azure-iot-operations
 spec:
   serviceAccountName: mqtt-client
 
-  volumes: 
-    # SAT token used to authenticate between the application and the MQTT broker
-    - name: mqtt-client-token
-      projected:
-        sources:
-          - serviceAccountToken:
-              path: mqtt-client-token
-              audience: aio-mq-dmqtt
-              expirationSeconds: 86400
-    
-    # Certificate chain for the application to validate the MQTT broker    
-    - name: aio-mq-ca-cert-chain
-      configMap:
-        name: aio-mq-ca-cert-chain
+  volumes:
+
+  # SAT token used to authenticate between the application and the MQTT broker  
+  - name: mqtt-client-token
+    projected:
+      sources:
+      - serviceAccountToken:
+          path: mqtt-client-token
+          audience: aio-mq
+          expirationSeconds: 86400
+
+  # Certificate chain for the application to validate the MQTT broker              
+  - name: aio-ca-trust-bundle
+    configMap:
+      name: aio-ca-trust-bundle-test-only
 
   containers:
-    - name: mqtt-client-dotnet
-      image: ghcr.io/azure-samples/explore-iot-operations/mqtt-client-dotnet:latest
-      imagePullPolicy: IfNotPresent
-      volumeMounts:
-        - name: mqtt-client-token
-          mountPath: /var/run/secrets/tokens
-        - name: aio-mq-ca-cert-chain
-          mountPath: /certs/aio-mq-ca-cert/      
-      env:
-        - name: IOT_MQ_HOST_NAME
-          value: "aio-mq-dmqtt-frontend"
-        - name: IOT_MQ_PORT
-          value: "8883"
-        - name: IOT_MQ_TLS_ENABLED
-          value: "true"
+  - name: mqtt-client-dotnet
+    image: ghcr.io/azure-samples/explore-iot-operations/mqtt-client-dotnet:latest
+    volumeMounts:
+    - name: mqtt-client-token
+      mountPath: /var/run/secrets/tokens/
+    - name: aio-ca-trust-bundle
+      mountPath: /var/run/certs/aio-mq-ca-cert/
+    env:
+    - name: hostname
+      value: "aio-mq-dmqtt-frontend"
+    - name: tcpPort
+      value: "8883"
+    - name: useTls
+      value: "true"
+    - name: caFile
+      value: "/var/run/certs/aio-mq-ca-cert/ca.crt"
+    - name: satAuthFile
+      value: "/var/run/secrets/tokens/mqtt-client-token"
 ```
 
-The token is mounted into the container at the path specified in `containers[].volumeMount.mountPath`
-
 To run the sample, follow the instructions in its [README](https://github.com/Azure-Samples/explore-iot-operations/tree/main/samples/mqtt-client-dotnet).
 
 ## Related content