[DXP-1512] StreamX Platform adjustments

.gitignore

@@ -12,3 +12,6 @@ auth/*
 .env/*
 /secrets/generated/
 /target
+
+# streamx run delivery web service content repository
+/repository

README.md

@@ -38,6 +38,7 @@ The PureSight demo allows you to see each of these elements in action in real-ti
 Start the mesh defined in `mesh.yaml`:
 
 ```bash
+source env/local/.env.sh
 streamx run -f mesh.yaml
 ```
 
@@ -48,19 +49,21 @@ Wait until the process completes.
 Start PIM:
 
 ```bash
+source env/local/.env.sh
 sh scripts/run-pim.sh
 ```
 
 ### Run WebSight CMS
 
 ```bash
+source env/local/.env.sh
 sh scripts/run-websight.sh
 ```
 
 ### Run Proxy Server
 
 ```bash
-sh scripts/run-proxy.sh
+sh env/local/run-proxy.sh
 ```
 
 ### Verify the Setup
@@ -104,6 +107,7 @@ Visit: [http://pim.127.0.0.1.nip.io](http://pim.127.0.0.1.nip.io) and click the
 You can change the price of any product by passing the product ID and the desired price:
 
 ```bash
+source env/local/.env.sh
 sh scripts/prices/publish-price.sh B071FMSYNH 994
 ```
 
@@ -114,6 +118,7 @@ sh scripts/prices/publish-price.sh B071FMSYNH 994
 You can also add reviews for a product:
 
 ```bash
+source env/local/.env.sh
 sh scripts/reviews/publish.sh B071FMSYNH
 ```
 

deployment.yaml

@@ -1,25 +1,111 @@
+defaults:
+  global:
+    resources:
+      requests:
+        cpu: 400m
+        memory: 512Mi
+    probes: # TODO: Remove default kubernetes configs after default StreamX Operator defaults adjustment.
+      liveness:
+        httpGet:
+          path: /q/health/live
+          port: 8080
+        initialDelaySeconds: 0        # Default value
+        periodSeconds: 10             # Default value
+        timeoutSeconds: 1             # Default value
+        successThreshold: 1           # Default value
+        failureThreshold: 3           # Default value
+        readiness:
+          httpGet:
+            path: /q/health/ready
+            port: 8080
+          initialDelaySeconds: 0        # Default value
+          periodSeconds: 10             # Default value
+          timeoutSeconds: 1             # Default value
+          successThreshold: 1           # Default value
+          failureThreshold: 3           # Default value
+        startup:
+          httpGet:
+            path: /q/health/startup
+            port: 8080
+          initialDelaySeconds: 0        # Default value
+          periodSeconds: 10             # Default value
+          timeoutSeconds: 1             # Default value
+          successThreshold: 1           # Default value
+          failureThreshold: 3
+  delivery:
+    replicas: 3
+
 ingestion:
   rest-ingestion:
     ingress:
       enabled: true
+      ingressClassName: "nginx"
       annotations:
         nginx.ingress.kubernetes.io/proxy-body-size: "500m"
       hosts:
-        - host: ingestion.127.0.0.1.nip.io
-        - host: host.docker.internal
+        - host: ingestion.${streamx-ingress-ip}.nip.io
 delivery:
   blueprint-web:
     ingress:
       enabled: true
+      ingressClassName: "nginx"
       hosts:
-        - host: puresight.127.0.0.1.nip.io
+        - host: puresight.${streamx-ingress-ip}.nip.io
           paths:
             - servicePort: 80
+      tls:
+        - hosts:
+            - puresight.${streamx-ingress-ip}.nip.io
+          secretName: blueprint-web.crt
+      annotations:
+        cert-manager.io/cluster-issuer: "letsencrypt-cert-cluster-issuer"
   blueprint-search:
     ingress:
       enabled: true
+      ingressClassName: "nginx"
       hosts:
-        - host: puresight.127.0.0.1.nip.io
+        - host: puresight.${streamx-ingress-ip}.nip.io
           paths:
             - path: /search
+      tls:
+        - hosts:
+            - puresight.${streamx-ingress-ip}.nip.io
+          secretName: blueprint-search.crt
+      annotations:
+        cert-manager.io/cluster-issuer: "letsencrypt-cert-cluster-issuer"
+    probes:
+      liveness: { }
+    components:
+      opensearch:
+        sidecar: true
+        probes:
+          readiness:
+            httpGet:
+              path: /
+              port: 9200
+              scheme: HTTP
+            initialDelaySeconds: 5
+            periodSeconds: 10
+            timeoutSeconds: 5
+            successThreshold: 1
+            failureThreshold: 3
+          liveness:
+            httpGet:
+              path: /
+              port: 9200
+              scheme: HTTP
+            initialDelaySeconds: 5
+            periodSeconds: 15
+            timeoutSeconds: 5
+            failureThreshold: 3
+          startup:
+            httpGet:
+              path: /
+              port: 9200
+              scheme: HTTP
+            initialDelaySeconds: 30
+            periodSeconds: 10
+            timeoutSeconds: 5
+            successThreshold: 1
+            failureThreshold: 3
 

env/cloud/.env.sh

@@ -0,0 +1,8 @@
+# Cloud kubeconfig path. If StreamX Platform Terraform script was applied on the same host as this script is launched it can be taken from its 'kubeconfig_path' output.
+export KUBECONFIG=
+# Cloud Load Balancer IP. Should be taken from StreamX Platform Terraform script 'loadbalancer_ip' output
+export STREAMX_INGRESS_IP=
+export STREAMX_TOKEN_PIM=$(kubectl get secrets sx-sec-auth-jwt-pim -o jsonpath  -o jsonpath="{.data.jwt}" | base64 --decode)
+export STREAMX_TOKEN_WS=$(kubectl get secrets sx-sec-auth-jwt-websight -o jsonpath  -o jsonpath="{.data.jwt}" | base64 --decode)
+export STREAMX_INGESTION_URL="http://ingestion.${STREAMX_INGRESS_IP}.nip.io"
+export STREAMX_INTERNAL_INGESTION_URL="$STREAMX_INGESTION_URL"

env/local/.env.sh

@@ -0,0 +1,5 @@
+export STREAMX_TOKEN_PIM=
+export STREAMX_TOKEN_WS=
+export STREAMX_INGRESS_IP="127.0.0.1"
+export STREAMX_INGESTION_URL="http://ingestion.${STREAMX_INGRESS_IP}.nip.io"
+export STREAMX_INTERNAL_INGESTION_URL="http://host.docker.internal"

mesh.yaml

@@ -143,7 +143,7 @@ processing:
         topic: outboxes/web-resources
     environment:
       # local test domain, see readme
-      STREAMX_BLUEPRINTS_SITEMAP-GENERATOR-PROCESSING-SERVICE_BASE-URL: "http://puresight.127.0.0.1.nip.io"
+      STREAMX_BLUEPRINTS_SITEMAP-GENERATOR-PROCESSING-SERVICE_BASE-URL: "http://puresight.${STREAMX_INGRESS_IP}.nip.io"
       STREAMX_BLUEPRINTS_SITEMAP-GENERATOR-PROCESSING-SERVICE_OUTPUT-KEY: "/sitemap.xml"
 
   blueprint-indexable-resource-extractor:

scripts/price/publish-price.sh

@@ -1,9 +1,9 @@
-INGESTION_URL="http://ingestion.127.0.0.1.nip.io"
 PRODUCT_ID=${1:-B071FMSYNH}
 PRICE=${2:-2559}
 
-curl -o - -X POST "${INGESTION_URL}/ingestion/v1/channels/data/messages" \
+curl -o - -X POST "${STREAMX_INGESTION_URL}/ingestion/v1/channels/data/messages" \
   -H 'Content-Type: application/json' \
+  -H "Authorization: Bearer ${STREAMX_TOKEN_PIM}" \
   -d '{
         "key" : "price:'${PRODUCT_ID}'",
         "action" : "publish",

scripts/reviews/publish.sh

@@ -1,9 +1,8 @@
-INGESTION_URL="http://ingestion.127.0.0.1.nip.io"
 PRODUCT_ID=${1:-B071FMSYNH}
 
-curl -o - -X POST "${INGESTION_URL}/ingestion/v1/channels/data/messages" \
+curl -o - -X POST "${STREAMX_INGESTION_URL}/ingestion/v1/channels/data/messages" \
   -H 'Content-Type: application/json' \
-  -H "Authorization: Bearer ${TOKEN}" \
+  -H "Authorization: Bearer ${STREAMX_TOKEN_PIM}" \
   -d '{
         "key" : "review:'${PRODUCT_ID}':1",
         "action" : "publish",
@@ -18,9 +17,9 @@ curl -o - -X POST "${INGESTION_URL}/ingestion/v1/channels/data/messages" \
         }
       }'
 
-curl -o - -X POST "${INGESTION_URL}/ingestion/v1/channels/data/messages" \
+curl -o - -X POST "${STREAMX_INGESTION_URL}/ingestion/v1/channels/data/messages" \
   -H 'Content-Type: application/json' \
-  -H "Authorization: Bearer ${TOKEN}" \
+  -H "Authorization: Bearer ${STREAMX_TOKEN_PIM}" \
   -d '{
         "key" : "review:'${PRODUCT_ID}':2",
         "action" : "publish",

scripts/run-pim.sh

@@ -5,6 +5,7 @@ docker rm streamx-demo-sandbox-pim
 docker run --name streamx-demo-sandbox-pim \
   --add-host=host.docker.internal:host-gateway \
   -p 9000:8080 \
-  -e STREAMX_URL=http://host.docker.internal \
+  -e STREAMX_URL="$STREAMX_INTERNAL_INGESTION_URL" \
+  -e STREAMX_TOKEN="$STREAMX_TOKEN_PIM" \
   -e QUARKUS_HTTP_AUTH_FORM_TIMEOUT=PT1M \
   ${IMAGE}

scripts/run-websight.sh

@@ -8,5 +8,6 @@ docker run --name streamx-demo-sandbox-websight-cms \
   -p 5009:5009 \
   -e JAVA_DEBUG_PORT=5009 \
   -e STREAMX_PUBLICATION_ENABLE=true \
-  -e PURESIGHT_STREAMX_REST_INGESTION_HOST=http://host.docker.internal \
+  -e PURESIGHT_STREAMX_REST_INGESTION_HOST="$STREAMX_INTERNAL_INGESTION_URL" \
+  -e PURESIGHT_STREAMX_REST_INGESTION_AUTH_TOKEN="$STREAMX_TOKEN_WS" \
   ${IMAGE}