mqtt cred

ENVDB.matest

@@ -4,7 +4,7 @@ PGHOST=`kubectl get services traefik -n system -o jsonpath="{.status.loadBalance
 PGPASSWORD=`kubectl get secrets ma-db-cred -n $N -o jsonpath="{.data.PGPASSWORD}" | base64 --decode`
 PGUSER=`kubectl get secrets ma-db-cred -n $N -o jsonpath="{.data.PGUSER}" | base64 --decode`
 PGSSLMODE=`kubectl get secrets ma-db-cred -n $N -o jsonpath="{.data.PGSSLMODE}" | base64 --decode`
-PGDATABASE="matest"
+PGDATABASE="ma"
 export PGUSER PGHOST PGPASSWORD PGSSLMODE PGDATABASE
 
 MA_CONF=`cat config-test.json`

deployment/config.json

@@ -1,6 +1,7 @@
 {
   "mqtt": {
     "broker": "mqtt://emqx01-anonymous-cluster-internal.broker.svc.cluster.local:1883",
+    "username": "archiver",
     "tlsEnable": "false"
   },
   "includeTopics": [

deployment/deploy-yml.tmpl

@@ -23,6 +23,8 @@ spec:
           envFrom:
             - secretRef: 
                 name: ma-db-cred
+            - secretRef: 
+                name: ma-mqtt-cred
             - configMapRef:
                 name: ma-conf
 

deployment/deploy.sh

@@ -3,21 +3,20 @@
 
 
 ARG1=$1
-NAMESPACE=`cat namespace`
 IMAGE_NAME=$FORGE_NAME/$CI_REPO
 
 DEPLOYMENT_DIR=$PWD/deployment
 
 
 
-pushd $DEPLOYMENT_DIR > /dev/null
+pushd $DEPLOYMENT_DIR
 
-./roll-db-credential.sh 
+NAMESPACE=`cat namespace`
 
 kubectl create configmap ma-conf \
   --from-literal=MA_CONF="`cat config.json`" \
   --dry-run=client \
-  --o yaml \
+  -o yaml \
   --save-config | \
   kubectl apply -f - -n $NAMESPACE
 
@@ -26,4 +25,4 @@ cat deploy-yml.tmpl | \
   kubectl apply -f - -n $NAMESPACE
 
 
-popd /dev/null
+popd

deployment/roll-credentials.sh

@@ -11,6 +11,7 @@ LOGIN=ma
 PASSWORD=`openssl rand -base64 24`
 NAMESPACE=`cat namespace`
 
+
 psql <<EOF
 do
 \$\$