Ambassador mappings for all services. Edit tests.

* Add ambassador mappings for all deployed services
* Edit tests to use specified domain name
* Add domain name related info to readme

Signed-off-by: Mikael Saarinen <mikael.saarinen@oulu.fi>

Author: msrn

README.md

@@ -25,6 +25,7 @@ $ terraform apply ./modules/tf_state_storage_azure
 ```
 ### No separate storage resource group (default)
 
+2. Remember to edit `main.tf` email variable to a real one for TLS certificate
 2. Deploy main service stack
 
 ```bash
@@ -43,6 +44,16 @@ $ terraform apply ./modules/storage_rg
 $ terraform apply -var=use_separate_storage_rg=true ./
 ```
 
+## After deployment
+
+After deployment you can use following url for accessing services and adapters {terraform-workspace}.westeurope.cloudapp.azure.com
+
+Hono registry: `{terraform-workspace}.westeurope.cloudapp.azure.com/registry`
+
+Grafana: `{terraform-workspace}.westeurope.cloudapp.azure.com/grafana`
+
+Jaeger: `{terraform-workspace}.westeurope.cloudapp.azure.com/jaeger`
+
 ## License
 [MIT License](./LICENSE)
 

ambassador_mappings.yaml

@@ -4,14 +4,25 @@ metadata:
   name: hono-mqtt-adapter
 spec:
   port: 1883
+  #host: ${domain}
   service: hono-adapter-mqtt-vertx:1883
 ---
 apiVersion: getambassador.io/v2
 kind:  TCPMapping
+metadata:
+  name: secure-hono-mqtt-adapter
+spec:
+  port: 8883
+  #host: ${domain}
+  service: hono-adapter-mqtt-vertx:8883
+---
+apiVersion: getambassador.io/v2
+kind:  TCPMapping
 metadata:
   name: hono-device-registry
 spec:
   port: 28080
+  #host: ${domain}
   service: hono-service-device-registry-ext:28080
 ---
 apiVersion: getambassador.io/v2
@@ -28,6 +39,7 @@ metadata:
   name: hono-kafka-external
 spec:
   port: 9092
+  #host: ${domain}
   service: hono-kafka-0-external:9092
 ---
 apiVersion: getambassador.io/v2
@@ -55,9 +67,9 @@ kind:  Mapping
 metadata:
   name: jaeger-operator-jaeger-query
 spec:
-  #port: 80
-  prefix: /jaeger/
-  rewrite: /jaeger/
+  port: 80
+  prefix: /jaeger
+  rewrite: /jaeger
   #host_redirect: true
   host: ${domain}
   service: jaeger-operator-jaeger-query:16686
@@ -68,8 +80,8 @@ metadata:
   name: jaeger-operator-jaeger-query-tcp
 spec:
   port: 16686
-  prefix: /jaeger/
-  host: ${domain}
+  #prefix: /jaeger/
+  #host: ${domain}
   service: jaeger-operator-jaeger-query:16686
 ---
 apiVersion: getambassador.io/v2
@@ -82,6 +94,16 @@ spec:
   service: acme-challenge-service
 ---
 apiVersion: getambassador.io/v2
+kind: Mapping
+metadata:
+  name: hono-device-registry-mapping
+spec:
+  #port: 80
+  prefix: /registry
+  host: ${domain}
+  service: hono-service-device-registry-ext:28080
+---
+apiVersion: getambassador.io/v2
 kind: TLSContext
 metadata:
   name: ambassador-tls-terminator

modules/container_deployment/ambassador_values.yaml

@@ -11,6 +11,9 @@ service:
     - name: mqtt-adapter
       port: 1883
       targetPort: 1883
+    - name: mqtt-adaptersec
+      port: 8883
+      targetPort: 8883
     - name: device-registry
       port: 28080
       targetPort: 28080

modules/container_deployment/jaeger_values.yaml

@@ -1,12 +1,12 @@
 jaeger:
  create: true
  spec:
-    strategy: production
-    query:
-      serviceType: LoadBalancer
+    strategy: allInOne
+    allInOne:
+      image: jaegertracing/all-in-one:1.13
       options:
-        log-level: debug
-        query:
-          base-path: /jaeger
+          log-level: debug
+          query:
+            base-path: /jaeger
     ingress:
       enabled: false

tests/honoscript/receiver.sh

@@ -4,15 +4,15 @@ info=./config.json
 
 test -f $info || exit 1
 
-KAFKA_IP=$(jq -r .KAFKA_IP < $info)
-#KAFKA_IP=$"workspace-k8stest.westeurope.cloudapp.azure.com"
+DOMAIN_NAME=$(jq -r .DOMAIN_NAME <$info)
+KAFKA_PORT=$(jq -r .KAFKA_PORT < $info)
 MY_TENANT=$(jq -r .MY_TENANT < $info)
 KAFKA_TRUSTSTORE_PATH=$(jq -r .KAFKA_TRUSTSTORE_PATH < $info)
 
 java -jar hono-cli-1.9.0-exec.jar \
 --spring.profiles.active=receiver,local,kafka \
 --tenant.id=$MY_TENANT \
---hono.kafka.commonClientConfig.bootstrap.servers=$KAFKA_IP:9092 \
+--hono.kafka.commonClientConfig.bootstrap.servers=${DOMAIN_NAME}:${KAFKA_PORT} \
 --hono.kafka.commonClientConfig.security.protocol=SASL_SSL \
 --hono.kafka.commonClientConfig.sasl.jaas.config="org.apache.kafka.common.security.scram.ScramLoginModule required username=\"hono\" password=\"hono-secret\";" \
 --hono.kafka.commonClientConfig.sasl.mechanism=SCRAM-SHA-512 \

tests/honoscript/send.sh

@@ -23,7 +23,7 @@ function mqtt_message() {
     local MESSAGE_TYPE="$1"
     local CONTENT="$2"
 
-    mosquitto_pub -h $MQTT_ADAPTER_IP \
+    mosquitto_pub -h $DOMAIN_NAME -p $MQTT_PORT \
     -u $MY_DEVICE@$MY_TENANT -P $MY_PWD \
     -t $MESSAGE_TYPE -q 1 -m "${CONTENT}"
 
@@ -38,8 +38,9 @@ test -f $info || (echo "missing config.json" && exit 1)
 MY_DEVICE=$(jq -r .MY_DEVICE < $info)
 MY_TENANT=$(jq -r .MY_TENANT < $info)
 MY_PWD=$(jq -r .MY_PWD <$info)
-#HTTP_ADAPTER_IP=$(jq -r .HTTP_ADAPTER_IP <$info)
-MQTT_ADAPTER_IP=$(jq -r .MQTT_ADAPTER_IP <$info)
+DOMAIN_NAME=$(jq -r .DOMAIN_NAME <$info)
+MQTT_PORT=$(jq -r .MQTT_PORT <$info)
+MQTT_SECURE_PORT=$(jq -r .MQTT_SECURE_PORT <$info)
 
 if [[ "$#" = 2 ]]; then
     # Determine content type per message type given as argument

tests/honoscript/setup.sh

@@ -27,34 +27,25 @@ which curl &> /dev/null || die "Can't curl"
 which pwgen &> /dev/null || die "Needs pwgen"
 which mosquitto_pub &> /dev/null || die "Needs mosquitto-clients"
 
-REGISTRY_IP=$(timeout $TIME kubectl get service hono-service-device-registry-ext -o json | jq -r .status.loadBalancer.ingress[0].ip)
-#HTTP_ADAPTER_IP=$(timeout $TIME kubectl get service hono-adapter-http-vertx -o json | jq -r .status.loadBalancer.ingress[0].ip)
-MQTT_ADAPTER_IP=$(timeout $TIME kubectl get service hono-adapter-mqtt-vertx -o json | jq -r .status.loadBalancer.ingress[0].ip)
-KAFKA_IP=$(timeout $TIME kubectl get service hono-kafka-0-external -o json | jq -r .status.loadBalancer.ingress[0].ip)
+
+DNS_LABEL=$(timeout $TIME kubectl get service ambassador -o json | jq -r .metadata.annotations.\"service.beta.kubernetes.io/azure-dns-label-name\")
+MQTT_PORT=1883
+MQTT_SECURE_PORT=8883
+KAFKA_PORT=9092
 KAFKA_TRUSTSTORE_PATH=./truststore.jks
 kubectl get secrets hono-kafka-jks --template="{{index .data \"kafka.truststore.jks\" | base64decode}}" -n default > $KAFKA_TRUSTSTORE_PATH
 
-AMQP_NETWORK_IP=$(timeout $TIME kubectl get service hono-dispatch-router-ext -o json | jq -r .status.loadBalancer.ingress[0].ip)
-: ${REGISTRY_IP:?'Could not find registry ip'}
-#: ${HTTP_ADAPTER_IP:?'Could not find HTTP adapter ip'}
-: ${MQTT_ADAPTER_IP:?'Could not find MQTT adapter ip'}
-: ${AMQP_NETWORK_IP:?'Could not find AMQP network ip'}
-: ${KAFKA_IP:?'Could not find KAFKA network ip'}
-
-#echo $REGISTRY_IP
-#echo $HTTP_ADAPTER_IP
-#echo $MQTT_ADAPTER_IP
-#echo $AMQP_NETWORK_IP
+DOMAIN_NAME=${DNS_LABEL}".westeurope.cloudapp.azure.com"
 
-MY_TENANT=$(curl -m $TIME -X POST -H "content-type: application/json" http://$REGISTRY_IP:28080/v1/tenants --data-binary '{
+MY_TENANT=$(curl -m $TIME -X POST -H "content-type: application/json" https://${DOMAIN_NAME}/registry/v1/tenants --data-binary '{
   "ext": {
     "messaging-type": "kafka"
   }
 }' 2> /dev/null | jq -r .id )
 : ${MY_TENANT:?'Your tenant has moved out. Could not set MY_TENANT'}
 test ${#MY_TENANT} = 36 || die "MY_TENANT is the wrong size. Does not have 36 characters"
 
-MY_DEVICE=$(curl -m $TIME -X POST http://$REGISTRY_IP:28080/v1/devices/$MY_TENANT 2> /dev/null | jq -r .id)
+MY_DEVICE=$(curl -m $TIME -X POST https://${DOMAIN_NAME}/registry/v1/devices/$MY_TENANT 2> /dev/null | jq -r .id)
 : ${MY_DEVICE:?'Your device has left the building. Could not set MY_DEVICE'}
 test ${#MY_DEVICE} = 36 || die "MY_DEVICE doesn't fit. Does not have 36 characters"
 
@@ -80,16 +71,16 @@ BODY
 curl -m $TIME -f -X PUT \
     -H 'content-type: application/json' \
     --data-binary "$body" \
-    http://$REGISTRY_IP:28080/v1/credentials/$MY_TENANT/$MY_DEVICE || die "could not set password so curling failed"
+    https://${DOMAIN_NAME}/registry/v1/credentials/$MY_TENANT/$MY_DEVICE || die "could not set password so curling failed"
 
 
 #ADD "HTTP_ADAPTER_IP": "${HTTP_ADAPTER_IP}" when needed for HTTP messaging
 cat > config.json <<JSON
 {
-    "REGISTRY_IP": "${REGISTRY_IP}",
-    "MQTT_ADAPTER_IP": "${MQTT_ADAPTER_IP}",
-    "AMQP_NETWORK_IP": "${AMQP_NETWORK_IP}",
-    "KAFKA_IP": "${KAFKA_IP}",
+    "DOMAIN_NAME": "${DOMAIN_NAME}",
+    "MQTT_PORT": "${MQTT_PORT}",
+    "MQTT_SECURE_PORT": "${MQTT_SECURE_PORT}",
+    "KAFKA_PORT": "${KAFKA_PORT}",
     "MY_TENANT": "${MY_TENANT}",
     "MY_DEVICE": "${MY_DEVICE}",
     "MY_PWD": "${MY_PWD}",