use deprecated env vars for authentication in upgrade scripts

Author: dmytro-landiak

docker/scripts/docker-upgrade-tbmq.sh

@@ -39,9 +39,9 @@ COMPOSE_ARGS_UP="\
       up -d ${ADDITIONAL_STARTUP_SERVICES}"
 
 COMPOSE_ARGS_RUN="\
-      --env-file ./.env \
+      --env-file ./.env --env-file ./tb-mqtt-broker.env \
       -f docker-compose.yml ${ADDITIONAL_CACHE_ARGS} \
-      run --no-deps --rm -e MQTT_PERSISTENT_SESSION_DEVICE_PERSISTED_MESSAGES_LIMIT=1000 -e UPGRADE_TB=true \
+      run --no-deps --rm -e UPGRADE_TB=true \
       tbmq1"
 
 case $COMPOSE_VERSION in

k8s/aws/database-setup.yml

@@ -34,8 +34,12 @@ spec:
       imagePullPolicy: Always
       image: thingsboard/tbmq-node:2.1.0
       env:
-        - name: MQTT_PERSISTENT_SESSION_DEVICE_PERSISTED_MESSAGES_LIMIT
-          value: "1000"
+        - name: SECURITY_MQTT_BASIC_ENABLED
+          value: "true"
+        - name: SECURITY_MQTT_SSL_ENABLED
+          value: "false"
+        - name: SECURITY_MQTT_SSL_SKIP_VALIDITY_CHECK_FOR_CLIENT_CERT
+          value: "false"
       envFrom:
         - configMapRef:
             name: tb-broker-db-config

k8s/azure/database-setup.yml

@@ -34,8 +34,12 @@ spec:
       imagePullPolicy: Always
       image: thingsboard/tbmq-node:2.1.0
       env:
-        - name: MQTT_PERSISTENT_SESSION_DEVICE_PERSISTED_MESSAGES_LIMIT
-          value: "1000"
+        - name: SECURITY_MQTT_BASIC_ENABLED
+          value: "true"
+        - name: SECURITY_MQTT_SSL_ENABLED
+          value: "false"
+        - name: SECURITY_MQTT_SSL_SKIP_VALIDITY_CHECK_FOR_CLIENT_CERT
+          value: "false"
       envFrom:
         - configMapRef:
             name: tb-broker-db-config

k8s/gcp/database-setup.yml

@@ -34,8 +34,12 @@ spec:
       imagePullPolicy: Always
       image: thingsboard/tbmq-node:2.1.0
       env:
-        - name: MQTT_PERSISTENT_SESSION_DEVICE_PERSISTED_MESSAGES_LIMIT
-          value: "1000"
+        - name: SECURITY_MQTT_BASIC_ENABLED
+          value: "true"
+        - name: SECURITY_MQTT_SSL_ENABLED
+          value: "false"
+        - name: SECURITY_MQTT_SSL_SKIP_VALIDITY_CHECK_FOR_CLIENT_CERT
+          value: "false"
       envFrom:
         - configMapRef:
             name: tb-broker-db-config

k8s/minikube/database-setup.yml

@@ -36,8 +36,12 @@ spec:
       env:
         - name: REDIS_HOST
           value: "tb-redis"
-        - name: MQTT_PERSISTENT_SESSION_DEVICE_PERSISTED_MESSAGES_LIMIT
-          value: "1000"
+        - name: SECURITY_MQTT_BASIC_ENABLED
+          value: "true"
+        - name: SECURITY_MQTT_SSL_ENABLED
+          value: "false"
+        - name: SECURITY_MQTT_SSL_SKIP_VALIDITY_CHECK_FOR_CLIENT_CERT
+          value: "false"
       envFrom:
         - configMapRef:
             name: tb-broker-db-config

msa/tbmq/configs/tbmq-upgrade.sh

@@ -62,7 +62,6 @@ db_url="jdbc:postgresql://postgres:5432/thingsboard_mqtt_broker"
 db_username="postgres"
 db_password="postgres"
 redis_url="redis"
-device_persisted_msgs_limit=1000
 
 COMPOSE_VERSION=$(compose_version) || exit $?
 echo "Docker Compose version is: $COMPOSE_VERSION"
@@ -88,6 +87,14 @@ else
   exit 1
 fi
 
+# Check if .tbmq-upgrade.env is present
+if [ -f ".tbmq-upgrade.env" ]; then
+  echo "Found .tbmq-upgrade.env. Proceeding with upgrade..."
+else
+  echo ".tbmq-upgrade.env not found in current directory. Please create it before running upgrade."
+  exit 1
+fi
+
 case $COMPOSE_VERSION in
 V2)
   docker compose stop tbmq
@@ -97,11 +104,11 @@ V2)
   composeNetworkId=$(docker inspect -f '{{ range .NetworkSettings.Networks }}{{ .NetworkID }}{{ end }}' $postgresContainerName)
 
   docker run -it --network=$composeNetworkId \
+    --env-file .tbmq-upgrade.env \
     -e SPRING_DATASOURCE_URL=$db_url \
     -e SPRING_DATASOURCE_USERNAME=$db_username \
     -e SPRING_DATASOURCE_PASSWORD=$db_password \
     -e REDIS_HOST=$redis_url \
-    -e MQTT_PERSISTENT_SESSION_DEVICE_PERSISTED_MESSAGES_LIMIT=$device_persisted_msgs_limit \
     -v tbmq-data:/data \
     --rm \
     thingsboard/tbmq:$new_version upgrade-tbmq.sh
@@ -118,11 +125,11 @@ V1)
   composeNetworkId=$(docker inspect -f '{{ range .NetworkSettings.Networks }}{{ .NetworkID }}{{ end }}' $postgresContainerName)
 
   docker run -it --network=$composeNetworkId \
+    --env-file .tbmq-upgrade.env \
     -e SPRING_DATASOURCE_URL=$db_url \
     -e SPRING_DATASOURCE_USERNAME=$db_username \
     -e SPRING_DATASOURCE_PASSWORD=$db_password \
     -e REDIS_HOST=$redis_url \
-    -e MQTT_PERSISTENT_SESSION_DEVICE_PERSISTED_MESSAGES_LIMIT=$device_persisted_msgs_limit \
     -v tbmq-data:/data \
     --rm \
     thingsboard/tbmq:$new_version upgrade-tbmq.sh

msa/tbmq/configs/windows/tbmq-upgrade.ps1

@@ -52,7 +52,6 @@ try {
     $db_username = "postgres"
     $db_password = "postgres"
     $redis_url = "redis"
-    $device_persisted_msgs_limit=1000
 
     # Pull the new TBMQ image
     docker pull "thingsboard/tbmq:$new_version"
@@ -73,6 +72,14 @@ try {
         exit 1
     }
 
+    # Check if .tbmq-upgrade.env is present
+    if (Test-Path ".tbmq-upgrade.env") {
+        Write-Host "Found .tbmq-upgrade.env. Proceeding with upgrade..."
+    } else {
+        Write-Host ".tbmq-upgrade.env not found in current directory. Please create it before running upgrade."
+        exit 1
+    }
+
     switch ($COMPOSE_VERSION) {
         "V2" {
             docker compose stop tbmq
@@ -82,11 +89,11 @@ try {
             $composeNetworkId = (docker inspect -f '{{ range .NetworkSettings.Networks }}{{ .NetworkID }}{{ end }}' $postgresContainerName)
 
             docker run -it --network=$composeNetworkId `
+            --env-file .tbmq-upgrade.env `
             -e SPRING_DATASOURCE_URL=$db_url `
             -e SPRING_DATASOURCE_USERNAME=$db_username `
             -e SPRING_DATASOURCE_PASSWORD=$db_password `
             -e REDIS_HOST=$redis_url `
-            -e MQTT_PERSISTENT_SESSION_DEVICE_PERSISTED_MESSAGES_LIMIT=$device_persisted_msgs_limit `
             -v tbmq-data:/data `
             --rm `
             "thingsboard/tbmq:$new_version" upgrade-tbmq.sh
@@ -103,11 +110,11 @@ try {
             $composeNetworkId = (docker inspect -f '{{ range .NetworkSettings.Networks }}{{ .NetworkID }}{{ end }}' $postgresContainerName)
 
             docker run -it --network=$composeNetworkId `
+            --env-file .tbmq-upgrade.env `
             -e SPRING_DATASOURCE_URL=$db_url `
             -e SPRING_DATASOURCE_USERNAME=$db_username `
             -e SPRING_DATASOURCE_PASSWORD=$db_password `
             -e REDIS_HOST=$redis_url `
-            -e MQTT_PERSISTENT_SESSION_DEVICE_PERSISTED_MESSAGES_LIMIT=$device_persisted_msgs_limit `
             -v tbmq-data:/data `
             --rm `
             "thingsboard/tbmq:$new_version" upgrade-tbmq.sh