Add http-adapter routing parameters to more installers

apache · Nov 27, 2023 · 9000e41 · 9000e41
2 parents 405a929 + 94cac77
commit 9000e41
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 4 deletions.
diff --git a/installer/cli/deploy/standalone/extensions-all-jvm/docker-compose.yml b/installer/cli/deploy/standalone/extensions-all-jvm/docker-compose.yml
@@ -17,6 +17,8 @@ version: "3.4"
 services:
   extensions-all-jvm:
     image: ${SP_DOCKER_REGISTRY}/extensions-all-jvm:${SP_VERSION}
+    environment:
+      - SP_HTTP_SERVER_ADAPTER_ENDPOINT=extensions-all-jvm:8090
     depends_on:
       - consul
       - couchdb  

diff --git a/installer/cli/deploy/standalone/ui/docker-compose.yml b/installer/cli/deploy/standalone/ui/docker-compose.yml
@@ -17,6 +17,8 @@ version: "3.4"
 services:
   ui:
     image: ${SP_DOCKER_REGISTRY}/ui:${SP_VERSION}
+    environment:
+      - SP_HTTP_SERVER_ADAPTER_ENDPOINT=extensions-all-jvm:8090
     ports:
       - "80:8088"
     depends_on:

diff --git a/installer/cli/environments/full b/installer/cli/environments/full
@@ -19,9 +19,6 @@ backend
 extensions-all-jvm
 consul
 couchdb
-jobmanager
-taskmanager
 zookeeper
 kafka
 influxdb
-pipeline-elements-all-flink
diff --git a/installer/compose/docker-compose.full.yml b/installer/compose/docker-compose.full.yml
@@ -40,6 +40,8 @@ services:
 
   ui:
     image: "${SP_DOCKER_REGISTRY}/ui:${SP_VERSION}"
+    environment:
+      - SP_HTTP_SERVER_ADAPTER_ENDPOINT=extensions-all-jvm:8090
     ports:
       - "80:8088"
     depends_on:

diff --git a/installer/compose/docker-compose.minimal.yml b/installer/compose/docker-compose.minimal.yml
@@ -41,6 +41,8 @@ services:
 
   ui:
     image: "${SP_DOCKER_REGISTRY}/ui:${SP_VERSION}"
+    environment:
+      - SP_HTTP_SERVER_ADAPTER_ENDPOINT=extensions-iiot-minimal:8090
     ports:
       - "80:8088"
     depends_on:

diff --git a/installer/compose/docker-compose.nats.yml b/installer/compose/docker-compose.nats.yml
@@ -41,6 +41,8 @@ services:
 
   ui:
     image: "${SP_DOCKER_REGISTRY}/ui:${SP_VERSION}"
+    environment:
+      - SP_HTTP_SERVER_ADAPTER_ENDPOINT=extensions-all-jvm:8090
     ports:
       - "80:8088"
     depends_on:

diff --git a/installer/compose/docker-compose.pulsar.yml b/installer/compose/docker-compose.pulsar.yml
@@ -42,6 +42,8 @@ services:
 
   ui:
     image: "${SP_DOCKER_REGISTRY}/ui:${SP_VERSION}"
+    environment:
+      - SP_HTTP_SERVER_ADAPTER_ENDPOINT=extensions-all-jvm:8090
     ports:
       - "80:8088"
     depends_on:

diff --git a/installer/compose/docker-compose.quickstart.yml b/installer/compose/docker-compose.quickstart.yml
@@ -40,6 +40,8 @@ services:
 
   ui:
     image: "${SP_DOCKER_REGISTRY}/ui:${SP_VERSION}"
+    environment:
+      - SP_HTTP_SERVER_ADAPTER_ENDPOINT=extensions-all-jvm:8090
     ports:
       - "80:8088"
     depends_on:

diff --git a/installer/compose/docker-compose.yml b/installer/compose/docker-compose.yml
@@ -27,6 +27,8 @@ services:
   # StreamPipes services
   backend:
     image: "${SP_DOCKER_REGISTRY}/backend:${SP_VERSION}"
+    environment:
+      - SP_HTTP_SERVER_ADAPTER_ENDPOINT=extensions-all-jvm:8090
     depends_on:
       - consul
       - couchdb

diff --git a/installer/k8s/README.md b/installer/k8s/README.md
@@ -141,6 +141,7 @@ rm -rf ${HOME}/streampipes-k8s
 | Parameter Name                                  | Description                                             | Value                                    |
 |-------------------------------------------------|---------------------------------------------------------|------------------------------------------|
 | extensions.iiot.appName                         | IIoT extensions application name                        | extensions-all-iiot                      |
+| extensions.iiot.imageName                       | IIoT extensions image name                              | extensions-all-jvm                      |
 | extensions.iiot.port                            | Port for the IIoT extensions application                | 8090                                     |
 | extensions.iiot.service.name                    | Name of the IIoT extensions service                     | extensions-all-iiot                      |
 | extensions.iiot.service.port                    | TargetPort of the IIoT extensions service               | 8090                                     |

diff --git a/installer/k8s/templates/core/extensions-all-iiot-deployment.yaml b/installer/k8s/templates/core/extensions-all-iiot-deployment.yaml
@@ -34,7 +34,7 @@ spec:
           command: ["sh", "-c", "for i in $(seq 1 300); do nc -zvw1 {{.Values.streampipes.core.service.name}} {{ .Values.streampipes.core.service.port }} && exit 0 || sleep 3; done; exit 1"]
       containers:
         - name: extensions-all-iiot
-          image: {{ .Values.streampipes.registry }}/extensions-all-iiot:{{ .Values.streampipes.version }}
+          image: {{ .Values.streampipes.registry }}/{{ .Values.extensions.iiot.imageName }}:{{ .Values.streampipes.version }}
           imagePullPolicy: {{ .Values.pullPolicy }}
           ports:
             - containerPort: {{ .Values.extensions.iiot.port }}

diff --git a/installer/k8s/templates/core/ui-ingressroute.yaml b/installer/k8s/templates/core/ui-ingressroute.yaml
@@ -39,6 +39,11 @@ spec:
       services:
         - name: {{ .Values.streampipes.ui.appName }}
           port: {{ .Values.streampipes.ui.service.port }}
+    - match: Host(`{{ .Values.streampipes.ingressroute.host }}`) && PathPrefix(`/endpoints/`)
+      kind: Rule
+      services:
+        - name: {{ .Values.extensions.iiot.appName }}
+          port: {{ .Values.extensions.iiot.service.port }}
   {{- if .Values.streampipes.ingressroute.certResolverActive }}
   tls:
     certResolver: {{ .Values.streampipes.ingressroute.certResolver}}

diff --git a/installer/k8s/values.yaml b/installer/k8s/values.yaml
@@ -81,6 +81,7 @@ streampipes:
 extensions:
   iiot:
     appName: extensions-all-iiot
+    imageName: extensions-all-jvm
     port: 8090
     service:
       name: extensions-all-iiot