From 94cac773cdb928be2ebc476c77efa671bb59646c Mon Sep 17 00:00:00 2001 From: Stefan Obermeier Date: Sun, 26 Nov 2023 22:28:32 +0100 Subject: [PATCH] Add http-server route configuration to more installers --- docker-compose.yml | 2 +- .../standalone/extensions-all-jvm/docker-compose.dev.yml | 2 +- .../deploy/standalone/extensions-all-jvm/docker-compose.yml | 2 ++ installer/cli/deploy/standalone/ui/docker-compose.yml | 4 +++- installer/cli/environments/full | 3 --- installer/compose/docker-compose.full.yml | 2 ++ installer/compose/docker-compose.minimal.yml | 2 ++ installer/compose/docker-compose.nats.yml | 2 ++ installer/compose/docker-compose.pulsar.yml | 2 ++ installer/compose/docker-compose.quickstart.yml | 2 ++ installer/compose/docker-compose.yml | 2 ++ installer/k8s/README.md | 1 + .../k8s/templates/core/extensions-all-iiot-deployment.yaml | 2 +- installer/k8s/templates/core/ui-ingressroute.yaml | 5 +++++ installer/k8s/values.yaml | 1 + 15 files changed, 27 insertions(+), 7 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index ea62398072..feb1f99222 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -57,7 +57,7 @@ services: environment: - SP_HTTP_SERVER_ADAPTER_ENDPOINT=extensions-all-jvm:8090 ports: - - "80:8088" + - "8088:8088" depends_on: - couchdb - consul diff --git a/installer/cli/deploy/standalone/extensions-all-jvm/docker-compose.dev.yml b/installer/cli/deploy/standalone/extensions-all-jvm/docker-compose.dev.yml index 1c74532691..9dfc75b477 100644 --- a/installer/cli/deploy/standalone/extensions-all-jvm/docker-compose.dev.yml +++ b/installer/cli/deploy/standalone/extensions-all-jvm/docker-compose.dev.yml @@ -19,4 +19,4 @@ services: labels: org.apache.streampipes.dev.extensions-all-jvm.service.description: "Dev extensions-all-jvm service" ports: - - "8090:8090" + - "8003:8090" diff --git a/installer/cli/deploy/standalone/extensions-all-jvm/docker-compose.yml b/installer/cli/deploy/standalone/extensions-all-jvm/docker-compose.yml index 287b34dfd0..368054457a 100644 --- 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 index bd88b873d8..a9798619cc 100644 --- a/installer/cli/deploy/standalone/ui/docker-compose.yml +++ b/installer/cli/deploy/standalone/ui/docker-compose.yml @@ -17,8 +17,10 @@ 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" + - "8082:8088" depends_on: - couchdb - consul diff --git a/installer/cli/environments/full b/installer/cli/environments/full index f751a50862..bf188948bd 100644 --- 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 index 00029cdddb..d7b7fcd7da 100644 --- 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 index 0a4246298a..0753d96cdc 100644 --- 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 index 2105321395..021324085b 100644 --- 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 index ca11f9c02f..04d294a511 100644 --- 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 index c676359ea4..47be6d8959 100644 --- 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 index 4f9bb5bad2..131fc1c604 100644 --- 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 index adeca3ea09..0077972583 100644 --- 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 index 16a1e88bf0..cecc9a18f7 100644 --- 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 index 812d83e604..64609e5d01 100644 --- 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 index 33885487cd..435aecb8d2 100644 --- 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