it works

RedHatInsights · Jul 11, 2023 · 1b180af · 1b180af
1 parent e1dfcd8
commit 1b180af
Showing 1 changed file with 45 additions and 21 deletions.
diff --git a/deploy/clowdapp.yml b/deploy/clowdapp.yml
@@ -75,11 +75,18 @@ objects:
         - mountPath: /tmp/jwt_keys
           name: volume-mqtt-jwt-keys
           readOnly: true
+        - mountPath: /tmp/broker/keys
+          name: volume-mqtt-broker-keys
+          readOnly: true
         volumes:
         - name: volume-mqtt-jwt-keys
           secret:
             defaultMode: 420
             secretName: cloud-connector-mqtt-credentials
+        - name: volume-mqtt-broker-keys
+          secret:
+            defaultMode: 420
+            secretName: cloud-connector-mqtt-consumer-cert
         env:
         - name: CLOUD_CONNECTOR_LOG_LEVEL
           value: ${{LOG_LEVEL}}
@@ -88,14 +95,16 @@ objects:
 
         - name: CLOUD_CONNECTOR_MQTT_BROKER_ADDRESS
           value: ${{MQTT_BROKER_ADDRESS}}
-        - name: CLOUD_CONNECTOR_MQTT_BROKER_JWT_GENERATOR_IMPL
-          value: jwt_rsa_generator
-        - name: CLOUD_CONNECTOR_JWT_PRIVATE_KEY_FILE
-          value: /tmp/jwt_keys/jwt_signing_key.pem
+        - name: CLOUD_CONNECTOR_MQTT_BROKER_TLS_KEY_FILE
+          value: /tmp/broker/keys/key.pem
+        - name: CLOUD_CONNECTOR_MQTT_BROKER_TLS_CERT_FILE
+          value: /tmp/broker/keys/cert.pem
+        - name: CLOUD_CONNECTOR_MQTT_CLIENT_ID
+          value: "cloud-connector-3"
         - name: CLOUD_CONNECTOR_MQTT_USE_HOSTNAME_AS_CLIENT_ID
-          value: "true"
+          value: "false"
         - name: CLOUD_CONNECTOR_MQTT_BROKER_TLS_SKIP_VERIFY
-          value: ${MQTT_BROKER_TLS_SKIP_VERIFY}
+          value: "false"
         - name: CLOUD_CONNECTOR_MQTT_CLEAN_SESSION
           value: ${API_SERVER_MQTT_CLEAN_SESSION}
         - name: CLOUD_CONNECTOR_SHUTDOWN_ON_MQTT_CONNECTION_LOST
@@ -177,11 +186,18 @@ objects:
         - mountPath: /tmp/jwt_keys
           name: volume-mqtt-jwt-keys
           readOnly: true
+        - mountPath: /tmp/broker/keys
+          name: volume-mqtt-broker-keys
+          readOnly: true
         volumes:
         - name: volume-mqtt-jwt-keys
           secret:
             defaultMode: 420
             secretName: cloud-connector-mqtt-credentials
+        - name: volume-mqtt-broker-keys
+          secret:
+            defaultMode: 420
+            secretName: cloud-connector-mqtt-consumer-cert
         env:
         - name: CLOUD_CONNECTOR_LOG_LEVEL
           value: ${{LOG_LEVEL}}
@@ -190,15 +206,14 @@ objects:
 
         - name: CLOUD_CONNECTOR_MQTT_BROKER_ADDRESS
           value: ${{MQTT_BROKER_ADDRESS}}
-        - name: CLOUD_CONNECTOR_MQTT_BROKER_JWT_GENERATOR_IMPL
-          value: jwt_rsa_generator
-        - name: CLOUD_CONNECTOR_JWT_PRIVATE_KEY_FILE
-          value: /tmp/jwt_keys/jwt_signing_key.pem
+        - name: CLOUD_CONNECTOR_MQTT_BROKER_TLS_KEY_FILE
+          value: /tmp/broker/keys/key.pem
+        - name: CLOUD_CONNECTOR_MQTT_BROKER_TLS_CERT_FILE
+          value: /tmp/broker/keys/cert.pem
+        - name: CLOUD_CONNECTOR_MQTT_USE_HOSTNAME_AS_CLIENT_ID
+          value: "false"
         - name: CLOUD_CONNECTOR_MQTT_CLIENT_ID
-          valueFrom:
-            secretKeyRef:
-              key: mqtt.user
-              name: cloud-connector-mqtt-credentials
+          value: "cloud-connector-1"
         - name: CLOUD_CONNECTOR_MQTT_TOPIC_PREFIX
           value: ${{MQTT_TOPIC_PREFIX}}
         - name: CLOUD_CONNECTOR_MQTT_BROKER_TLS_SKIP_VERIFY
@@ -281,6 +296,9 @@ objects:
           readOnly: true
         - mountPath: /tmp/cloud-connector-config
           name: client-id-to-account-id-map
+        - mountPath: /tmp/broker/keys
+          name: volume-mqtt-broker-keys
+          readOnly: true
         volumes:
         - name: volume-mqtt-jwt-keys
           secret:
@@ -290,6 +308,10 @@ objects:
           secret:
             defaultMode: 420
             secretName: client-id-to-account-id-map-config
+        - name: volume-mqtt-broker-keys
+          secret:
+            defaultMode: 420
+            secretName: cloud-connector-mqtt-consumer-cert
         env:
         - name: CLOUD_CONNECTOR_LOG_LEVEL
           value: ${{LOG_LEVEL}}
@@ -298,16 +320,18 @@ objects:
 
         - name: CLOUD_CONNECTOR_MQTT_BROKER_ADDRESS
           value: ${{MQTT_BROKER_ADDRESS}}
-        - name: CLOUD_CONNECTOR_MQTT_BROKER_JWT_GENERATOR_IMPL
-          value: jwt_rsa_generator
-        - name: CLOUD_CONNECTOR_JWT_PRIVATE_KEY_FILE
-          value: /tmp/jwt_keys/jwt_signing_key.pem
+        - name: CLOUD_CONNECTOR_MQTT_BROKER_TLS_KEY_FILE
+          value: /tmp/broker/keys/key.pem
+        - name: CLOUD_CONNECTOR_MQTT_BROKER_TLS_CERT_FILE
+          value: /tmp/broker/keys/cert.pem
+        - name: CLOUD_CONNECTOR_MQTT_CLIENT_ID
+          value: "cloud-connector-2"
+        - name: CLOUD_CONNECTOR_MQTT_USE_HOSTNAME_AS_CLIENT_ID
+          value: "false"
         - name: CLOUD_CONNECTOR_MQTT_TOPIC_PREFIX
           value: ${{MQTT_TOPIC_PREFIX}}
-        - name: CLOUD_CONNECTOR_MQTT_USE_HOSTNAME_AS_CLIENT_ID
-          value: "true"
         - name: CLOUD_CONNECTOR_MQTT_BROKER_TLS_SKIP_VERIFY
-          value: ${MQTT_BROKER_TLS_SKIP_VERIFY}
+          value: "false"
         - name: CLOUD_CONNECTOR_MQTT_CLEAN_SESSION
           value: ${KAFKA_CONSUMER_MQTT_CLEAN_SESSION}
         - name: CLOUD_CONNECTOR_SHUTDOWN_ON_MQTT_CONNECTION_LOST