This is an automated email from the ASF dual-hosted git repository. obermeier pushed a commit to branch kdkdk in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit 717c072fb950afb0b09423f715c0ab72df320393 Author: Stefan Obermeier <[email protected]> AuthorDate: Sun Nov 26 22:28:32 2023 +0100 dfsdfsafsd --- docker-compose.yml | 2 +- .../cli/deploy/standalone/extensions-all-jvm/docker-compose.dev.yml | 2 +- .../cli/deploy/standalone/extensions-all-jvm/docker-compose.yml | 2 ++ installer/cli/deploy/standalone/ui/docker-compose.yml | 4 +++- installer/cli/environments/full | 3 --- installer/k8s/templates/core/extensions-all-iiot-deployment.yaml | 2 +- installer/k8s/templates/core/ui-ingressroute.yaml | 5 +++++ installer/k8s/values.yaml | 1 + 8 files changed, 14 insertions(+), 7 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index ea6239807..feb1f9922 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 1c7453269..9dfc75b47 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 287b34dfd..368054457 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 bd88b873d..a9798619c 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 f751a5086..bf188948b 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/k8s/templates/core/extensions-all-iiot-deployment.yaml b/installer/k8s/templates/core/extensions-all-iiot-deployment.yaml index 16a1e88bf..cecc9a18f 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 812d83e60..112ca89fe 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.streampipes.ui.appName }} // Use endpoint service + port: {{ .Values.streampipes.ui.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 33885487c..435aecb8d 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
