fixed password retrieval

Signed-off-by: Raffaele Spazzoli <[email protected]>
raffaelespazzoli · Nov 10, 2020 · 54fe5ee · 54fe5ee
1 parent 17e061f
commit 54fe5ee
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/misc4.0/amq/interconnect-external-application-properties.yaml b/misc4.0/amq/interconnect-external-application-properties.yaml
@@ -19,7 +19,7 @@ data:
     amqphub:
       amqp10jms:
         username: guest@router-mesh
-        password:  CxhnpJMK 
+        password:  ${password} 
         #https://qpid.apache.org/releases/qpid-jms-0.54.0/docs/index.html#ssl-transport-configuration-options        
         remote-url: amqps://router-mesh-5671-amq.apps.${base_domain}:443?transport.trustStoreLocation=/certs/truststore.jks&transport.trustStorePassword=changeit
         pool:

diff --git a/misc4.0/amq/interconnect-internal-application-properties.yaml b/misc4.0/amq/interconnect-internal-application-properties.yaml
@@ -19,7 +19,7 @@ data:
     amqphub:
       amqp10jms:
         username: guest@router-mesh
-        password:  CxhnpJMK 
+        password:  ${password} 
         #https://qpid.apache.org/releases/qpid-jms-0.54.0/docs/index.html#ssl-transport-configuration-options        
         remote-url: amqps://router-mesh:5671?transport.trustStoreLocation=/certs/truststore.jks&transport.trustStorePassword=changeit
         pool:

diff --git a/misc4.0/amq/readme.md b/misc4.0/amq/readme.md
@@ -142,7 +142,8 @@ oc rollout restart deployment router-mesh -n ${project}
 
 ```shell
 oc new-app openjdk-11~https://github.com/raffaelespazzoli/amq-test --name springboot-interconnect-internal -n ${project} -l app=interconnect-internal-test
-oc apply -f interconnect-internal-application-properties.yaml -n ${project}
+export password=$(oc get secret router-mesh-users -n ${project} -o jsonpath='{.data.guest}' | base64 -d)
+envsubst < ./interconnect-internal-application-properties.yaml | oc apply -f - -n ${project}
 oc set volume deployment/springboot-interconnect-internal --add --configmap-name=interconnect-internal-application-properties --mount-path=/config --name=config -t configmap -n ${project}
 oc set volume deployment/springboot-interconnect-internal --add --secret-name=router-mesh-tls --mount-path=/certs --name=certs -t secret -n ${project}
 oc set env deployment/springboot-interconnect-internal SPRING_CONFIG_LOCATION=/config/application-properties.yaml -n ${project}
@@ -152,7 +153,8 @@ oc set env deployment/springboot-interconnect-internal SPRING_CONFIG_LOCATION=/c
 
 ```shell
 oc new-app openjdk-11~https://github.com/raffaelespazzoli/amq-test --name springboot-interconnect-external -n ${project} -l app=interconnect-external-test
-envsubst < ./interconnect-external-application-properties.yaml |  oc apply -f - -n ${project}
+export password=$(oc get secret router-mesh-users -n ${project} -o jsonpath='{.data.guest}' | base64 -d)
+envsubst < ./interconnect-external-application-properties.yaml | oc apply -f - -n ${project}
 oc set volume deployment/springboot-interconnect-external --add --configmap-name=interconnect-external-application-properties --mount-path=/config --name=config -t configmap -n ${project}
 oc set volume deployment/springboot-interconnect-external --add --secret-name=router-mesh-tls --mount-path=/certs --name=certs -t secret -n ${project}
 oc set env deployment/springboot-interconnect-external SPRING_CONFIG_LOCATION=/config/application-properties.yaml -n ${project}