This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new d3ca321f5 1207 improve helm charts (#1344)
d3ca321f5 is described below
commit d3ca321f503ea0da78dbcff336ed9fe2908c1cbb
Author: Dominik Riemer <[email protected]>
AuthorDate: Mon Feb 27 20:20:29 2023 +0100
1207 improve helm charts (#1344)
* Add more configuration options to helm charts (#1207)
* Add couchdb credentials to values.yaml (#1207)
* Add more configuration options to helm charts (#1207)
* Add couchdb credentials to values.yaml (#1207)
* Add configmap to manage nginx configuration (#1207)
* Update helm configuration (#1207)
* Use non-root Dockerfile for nginx (#1207)(#454)
* Improve Ingress and Ingressroute (#1207)
---
docker-compose.yml | 2 +-
.../cli/deploy/standalone/ui/docker-compose.yml | 2 +-
installer/compose/docker-compose.full.yml | 2 +-
installer/compose/docker-compose.nats.yml | 2 +-
installer/compose/docker-compose.yml | 2 +-
.../k8s/templates/core/backend-deployment.yaml | 27 +++----
installer/k8s/templates/core/backend-pv-pvc.yaml | 42 ----------
.../backend-pvc.yaml} | 22 +++--
installer/k8s/templates/core/backend-service.yaml | 8 +-
installer/k8s/templates/core/ui-configmap.yaml | 51 ++++++++++++
.../templates/core/{ui.yaml => ui-deployment.yaml} | 28 +++----
installer/k8s/templates/core/ui-ingress.yaml | 25 ++++--
installer/k8s/templates/core/ui-ingressroute.yaml | 46 +++++++++++
installer/k8s/templates/core/ui-service.yaml | 10 +--
...nt.yaml => extensions-all-iiot-deployment.yaml} | 10 +--
...rvice.yaml => extensions-all-iiot-service.yaml} | 6 +-
.../pipeline-elements-all-flink-deployment.yaml | 37 ---------
.../external/consul/consul-deployment.yaml | 16 ++--
.../templates/external/consul/consul-pv-pvc.yaml | 22 +----
.../templates/external/consul/consul-service.yaml | 6 +-
.../external/couchdb/couchdb-deployment.yaml | 20 ++---
.../templates/external/couchdb/couchdb-pv-pvc.yaml | 22 +----
.../external/couchdb/couchdb-service.yaml | 6 +-
.../external/flink/jobmanager-deployment.yaml | 46 -----------
.../external/flink/jobmanager-service.yaml | 34 --------
.../external/flink/taskmanager-deployment.yaml | 43 ----------
.../external/influxdb/influxdb-deployment.yaml | 34 ++++----
.../templates/external/influxdb/influxdb-pvc.yaml | 20 +----
.../external/influxdb/influxdb-service.yaml | 4 +-
.../templates/external/influxdb/influxdb2-pvc.yaml | 21 +----
.../templates/external/nats/nats-deployment.yaml | 8 +-
.../k8s/templates/external/nats/nats-service.yaml | 2 +
installer/k8s/values.yaml | 94 +++++++++++++++++-----
ui/Dockerfile | 12 ++-
ui/nginx_config/default.conf | 23 +-----
ui/nginx_config/ssl.conf | 2 +-
36 files changed, 322 insertions(+), 435 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index bdf4d4e30..5570b5f3d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -55,7 +55,7 @@ services:
dockerfile: Dockerfile
image: streampipes_ui:release-validation
ports:
- - "80:80"
+ - "80:8088"
depends_on:
- couchdb
- consul
diff --git a/installer/cli/deploy/standalone/ui/docker-compose.yml
b/installer/cli/deploy/standalone/ui/docker-compose.yml
index c52698d01..bd88b873d 100644
--- a/installer/cli/deploy/standalone/ui/docker-compose.yml
+++ b/installer/cli/deploy/standalone/ui/docker-compose.yml
@@ -18,7 +18,7 @@ services:
ui:
image: ${SP_DOCKER_REGISTRY}/ui:${SP_VERSION}
ports:
- - "80:80"
+ - "80:8088"
depends_on:
- couchdb
- consul
diff --git a/installer/compose/docker-compose.full.yml
b/installer/compose/docker-compose.full.yml
index af8efbe18..3dae15baa 100644
--- a/installer/compose/docker-compose.full.yml
+++ b/installer/compose/docker-compose.full.yml
@@ -69,7 +69,7 @@ services:
ui:
image: "${SP_DOCKER_REGISTRY}/ui:${SP_VERSION}"
ports:
- - "80:80"
+ - "80:8088"
depends_on:
- couchdb
- consul
diff --git a/installer/compose/docker-compose.nats.yml
b/installer/compose/docker-compose.nats.yml
index 10e30d6c2..210532139 100644
--- a/installer/compose/docker-compose.nats.yml
+++ b/installer/compose/docker-compose.nats.yml
@@ -42,7 +42,7 @@ services:
ui:
image: "${SP_DOCKER_REGISTRY}/ui:${SP_VERSION}"
ports:
- - "80:80"
+ - "80:8088"
depends_on:
- couchdb
- consul
diff --git a/installer/compose/docker-compose.yml
b/installer/compose/docker-compose.yml
index 2bc0469df..102fd87cc 100644
--- a/installer/compose/docker-compose.yml
+++ b/installer/compose/docker-compose.yml
@@ -41,7 +41,7 @@ services:
ui:
image: "${SP_DOCKER_REGISTRY}/ui:${SP_VERSION}"
ports:
- - "80:80"
+ - "80:8088"
depends_on:
- couchdb
- consul
diff --git a/installer/k8s/templates/core/backend-deployment.yaml
b/installer/k8s/templates/core/backend-deployment.yaml
index 8bd00c891..52c146fb2 100644
--- a/installer/k8s/templates/core/backend-deployment.yaml
+++ b/installer/k8s/templates/core/backend-deployment.yaml
@@ -16,43 +16,34 @@
apiVersion: apps/v1
kind: Deployment
metadata:
- name: backend
+ name: {{ .Values.streampipes.core.appName }}
spec:
selector:
matchLabels:
- app: backend
+ app: {{ .Values.streampipes.core.appName }}
replicas: 1
template:
metadata:
labels:
- app: backend
+ app: {{ .Values.streampipes.core.appName }}
spec:
hostAliases:
- ip: "127.0.0.1"
hostnames:
- "backend"
volumes:
- - name: backend-pv
+ - name: {{ .Values.streampipes.core.persistence.pvName }}
persistentVolumeClaim:
- claimName: backend-pvc
- # - name: files-pv
- # persistentVolumeClaim:
- # claimName: files-pvc
+ claimName: {{ .Values.streampipes.core.persistence.claimName }}
containers:
- - name: backend
+ - name: {{ .Values.streampipes.core.appName }}
image: {{ .Values.streampipes.registry }}/backend:{{
.Values.streampipes.version }}
imagePullPolicy: {{ .Values.pullPolicy }}
env:
- name: SP_PRIORITIZED_PROTOCOL
- {{ if (eq .Values.preferredBroker "nats") }}
- value: "nats"
- {{ else }}
- value: "kafka"
- {{ end }}
+ value: {{ .Values.preferredBroker }}
ports:
- - containerPort: 8030
+ - containerPort: {{ .Values.streampipes.core.port }}
volumeMounts:
- mountPath: "/root/.streampipes"
- name: backend-pv
- # - mountPath: "/spImages"
- # name: files-pv
+ name: {{ .Values.streampipes.core.persistence.pvName }}
diff --git a/installer/k8s/templates/core/backend-pv-pvc.yaml
b/installer/k8s/templates/core/backend-pv-pvc.yaml
deleted file mode 100644
index 724b87f46..000000000
--- a/installer/k8s/templates/core/backend-pv-pvc.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-kind: PersistentVolume
-metadata:
- name: backend-pv
-spec:
- storageClassName: local-storage-backend
- capacity:
- storage: 50Mi
- accessModes:
- - {{ .Values.persistentVolumeAccessModes }}
- persistentVolumeReclaimPolicy: {{ .Values.persistentVolumeReclaimPolicy }}
- hostPath:
- path: {{ .Values.hostPath }}/backend
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
- labels:
- app: backend
- name: backend-pvc
-spec:
- storageClassName: local-storage-backend
- accessModes:
- - {{ .Values.persistentVolumeAccessModes }}
- resources:
- requests:
- storage: 50Mi
\ No newline at end of file
diff --git
a/installer/k8s/templates/extensions/pipeline-elements/pipeline-elements-all-flink-service.yaml
b/installer/k8s/templates/core/backend-pvc.yaml
similarity index 71%
rename from
installer/k8s/templates/extensions/pipeline-elements/pipeline-elements-all-flink-service.yaml
rename to installer/k8s/templates/core/backend-pvc.yaml
index 18295dfb8..43ccf61fc 100644
---
a/installer/k8s/templates/extensions/pipeline-elements/pipeline-elements-all-flink-service.yaml
+++ b/installer/k8s/templates/core/backend-pvc.yaml
@@ -13,19 +13,17 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-{{- if (eq .Values.deployment "full") }}
+
apiVersion: v1
-kind: Service
+kind: PersistentVolumeClaim
metadata:
- name: pipeline-elements-all-flink
labels:
- name: pipeline-elements-all-flink
+ app: {{ .Values.streampipes.core.appName }}
+ name: {{ .Values.streampipes.core.persistence.claimName }}
spec:
- selector:
- app: pipeline-elements-all-flink
- ports:
- - name: main
- protocol: TCP
- port: 8090
- targetPort: 8090
-{{- end }}
+ storageClassName: {{ .Values.streampipes.core.persistence.storageClassName }}
+ accessModes:
+ - {{ .Values.persistentVolumeAccessModes }}
+ resources:
+ requests:
+ storage: 50Mi
diff --git a/installer/k8s/templates/core/backend-service.yaml
b/installer/k8s/templates/core/backend-service.yaml
index 24dc03c66..aa213c77a 100644
--- a/installer/k8s/templates/core/backend-service.yaml
+++ b/installer/k8s/templates/core/backend-service.yaml
@@ -16,12 +16,12 @@
apiVersion: v1
kind: Service
metadata:
- name: backend
+ name: {{ .Values.streampipes.core.service.name }}
spec:
selector:
- app: backend
+ app: {{ .Values.streampipes.core.appName }}
ports:
- name: main
protocol: TCP
- port: 8030
- targetPort: 8030
\ No newline at end of file
+ port: {{ .Values.streampipes.core.service.port }}
+ targetPort: {{ .Values.streampipes.core.port }}
diff --git a/installer/k8s/templates/core/ui-configmap.yaml
b/installer/k8s/templates/core/ui-configmap.yaml
new file mode 100644
index 000000000..4570fc226
--- /dev/null
+++ b/installer/k8s/templates/core/ui-configmap.yaml
@@ -0,0 +1,51 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: nginx-conf
+data:
+ default.conf: |
+ server {
+ listen {{ .Values.streampipes.ui.port }} default_server;
+ {{- if .Values.streampipes.ui.resolver }}
+ resolver {{ .Values.streampipes.ui.resolver }};
+ {{- end }}
+ root /usr/share/nginx/html;
+
+ # Enable gzip compression
+ gzip on;
+ gzip_static on;
+ gzip_types text/plain text/css application/json application/x-javascript
text/xml application/xml application/xml+rss text/javascript;
+ gzip_proxied any;
+ gzip_vary on;
+ gzip_comp_level 6;
+ gzip_buffers 16 8k;
+ gzip_http_version 1.1;
+
+ location /streampipes-backend {
+ set $upstream backend.sp-helmfile.svc.cluster.local:8030;
+
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-NginX-Proxy true;
+ proxy_pass http://$upstream;
+ proxy_ssl_session_reuse off;
+ proxy_set_header Host $http_host;
+ proxy_redirect off;
+ }
+ }
+
diff --git a/installer/k8s/templates/core/ui.yaml
b/installer/k8s/templates/core/ui-deployment.yaml
similarity index 68%
rename from installer/k8s/templates/core/ui.yaml
rename to installer/k8s/templates/core/ui-deployment.yaml
index 09a457ef2..27396b39b 100644
--- a/installer/k8s/templates/core/ui.yaml
+++ b/installer/k8s/templates/core/ui-deployment.yaml
@@ -16,30 +16,28 @@
apiVersion: apps/v1
kind: Deployment
metadata:
- name: ui
+ name: {{ .Values.streampipes.ui.appName }}
spec:
selector:
matchLabels:
- app: ui
+ app: {{ .Values.streampipes.ui.appName }}
replicas: 1
template:
metadata:
labels:
- app: ui
+ app: {{ .Values.streampipes.ui.appName }}
spec:
+ volumes:
+ - name: nginx-conf
+ configMap:
+ name: nginx-conf
containers:
- - name: ui
+ - name: {{ .Values.streampipes.ui.appName }}
image: {{ .Values.streampipes.registry }}/ui:{{
.Values.streampipes.version }}
imagePullPolicy: {{ .Values.pullPolicy }}
ports:
- - containerPort: 80
- # This is necessary because a custom dns resolver is set in nginx
default conf
- - name: dnsmasq
- image: fogsyio/go-dnsmasq:1.0.7
- args:
- - --listen
- - "127.0.0.11:53"
- - --default-resolver
- - --append-search-domains
- - --hostsfile=/etc/hosts
- - --verbose
+ - containerPort: {{ .Values.streampipes.ui.port }}
+ volumeMounts:
+ - name: nginx-conf
+ mountPath: /etc/nginx/conf.d/default.conf
+ subPath: default.conf
diff --git a/installer/k8s/templates/core/ui-ingress.yaml
b/installer/k8s/templates/core/ui-ingress.yaml
index 2f0c2933c..06f226205 100644
--- a/installer/k8s/templates/core/ui-ingress.yaml
+++ b/installer/k8s/templates/core/ui-ingress.yaml
@@ -13,18 +13,33 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+{{- if .Values.streampipes.ingress.active }}
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: streampipes
+ {{- with .Values.streampipes.ingress.annotations }}
+ annotations:
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
spec:
+ ingressClassName: {{ .Values.streampipes.ingress.className}}
rules:
- - http:
+ - host: {{ .Values.streampipes.ingress.host }}
+ http:
paths:
- path: /
pathType: Prefix
backend:
- service:
- name: ui
- port:
- number: 80
+ service:
+ name: {{ .Values.streampipes.ui.appName }}
+ port:
+ number: {{ .Values.streampipes.ui.service.port }}
+ - path: /streampipes-backend(/|$)(.*)
+ pathType: Prefix
+ backend:
+ service:
+ name: {{ .Values.streampipes.core.appName }}
+ port:
+ number: {{ .Values.streampipes.core.service.port }}
+{{- end }}
diff --git a/installer/k8s/templates/core/ui-ingressroute.yaml
b/installer/k8s/templates/core/ui-ingressroute.yaml
new file mode 100644
index 000000000..812d83e60
--- /dev/null
+++ b/installer/k8s/templates/core/ui-ingressroute.yaml
@@ -0,0 +1,46 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+{{- if .Values.streampipes.ingressroute.active }}
+apiVersion: traefik.containo.us/v1alpha1
+kind: IngressRoute
+metadata:
+ name: streampipes-ingressroute
+ {{- with .Values.streampipes.ingressroute.annotations }}
+ annotations:
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
+spec:
+ {{- with .Values.streampipes.ingressroute.entryPoints }}
+ entryPoints:
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
+ routes:
+ - match: Host(`{{ .Values.streampipes.ingressroute.host }}`) &&
PathPrefix(`/streampipes-backend`)
+ kind: Rule
+ priority: 100
+ services:
+ - name: {{ .Values.streampipes.core.appName }}
+ port: {{ .Values.streampipes.core.service.port }}
+ - match: Host(`{{ .Values.streampipes.ingressroute.host }}`) &&
PathPrefix(`/`)
+ kind: Rule
+ services:
+ - name: {{ .Values.streampipes.ui.appName }}
+ port: {{ .Values.streampipes.ui.service.port }}
+ {{- if .Values.streampipes.ingressroute.certResolverActive }}
+ tls:
+ certResolver: {{ .Values.streampipes.ingressroute.certResolver}}
+ {{- end }}
+{{- end }}
diff --git a/installer/k8s/templates/core/ui-service.yaml
b/installer/k8s/templates/core/ui-service.yaml
index f1e3bb75f..6308ffe8b 100644
--- a/installer/k8s/templates/core/ui-service.yaml
+++ b/installer/k8s/templates/core/ui-service.yaml
@@ -16,13 +16,13 @@
apiVersion: v1
kind: Service
metadata:
- name: ui
+ name: {{ .Values.streampipes.ui.service.name }}
spec:
selector:
- app: ui
- type: NodePort
+ app: {{ .Values.streampipes.ui.appName }}
+ type: {{ .Values.streampipes.ui.service.type }}
ports:
- name: main
protocol: TCP
- port: 80
- targetPort: 80
\ No newline at end of file
+ port: {{ .Values.streampipes.ui.service.port }}
+ targetPort: {{ .Values.streampipes.ui.port }}
diff --git
a/installer/k8s/templates/extensions/pipeline-elements/extensions-all-jvm-deployment.yaml
b/installer/k8s/templates/extensions/pipeline-elements/extensions-all-iiot-deployment.yaml
similarity index 86%
rename from
installer/k8s/templates/extensions/pipeline-elements/extensions-all-jvm-deployment.yaml
rename to
installer/k8s/templates/extensions/pipeline-elements/extensions-all-iiot-deployment.yaml
index 4edcdf554..318e3be10 100644
---
a/installer/k8s/templates/extensions/pipeline-elements/extensions-all-jvm-deployment.yaml
+++
b/installer/k8s/templates/extensions/pipeline-elements/extensions-all-iiot-deployment.yaml
@@ -16,20 +16,20 @@
apiVersion: apps/v1
kind: Deployment
metadata:
- name: extensions-all-jvm
+ name: extensions-all-iiot
spec:
selector:
matchLabels:
- app: extensions-all-jvm
+ app: extensions-all-iiot
replicas: 1
template:
metadata:
labels:
- app: extensions-all-jvm
+ app: extensions-all-iiot
spec:
containers:
- - name: extensions-all-jvm
- image: {{ .Values.streampipes.registry }}/extensions-all-jvm:{{
.Values.streampipes.version }}
+ - name: extensions-all-iiot
+ image: {{ .Values.streampipes.registry }}/extensions-all-iiot:{{
.Values.streampipes.version }}
imagePullPolicy: {{ .Values.pullPolicy }}
ports:
- containerPort: 8090
diff --git
a/installer/k8s/templates/extensions/pipeline-elements/extensions-all-jvm-service.yaml
b/installer/k8s/templates/extensions/pipeline-elements/extensions-all-iiot-service.yaml
similarity index 91%
rename from
installer/k8s/templates/extensions/pipeline-elements/extensions-all-jvm-service.yaml
rename to
installer/k8s/templates/extensions/pipeline-elements/extensions-all-iiot-service.yaml
index 8a3a36ad0..e87874625 100644
---
a/installer/k8s/templates/extensions/pipeline-elements/extensions-all-jvm-service.yaml
+++
b/installer/k8s/templates/extensions/pipeline-elements/extensions-all-iiot-service.yaml
@@ -16,12 +16,12 @@
apiVersion: v1
kind: Service
metadata:
- name: extensions-all-jvm
+ name: extensions-all-iiot
labels:
- name: extensions-all-jvm
+ name: extensions-all-iiot
spec:
selector:
- app: extensions-all-jvm
+ app: extensions-all-iiot
ports:
- name: main
protocol: TCP
diff --git
a/installer/k8s/templates/extensions/pipeline-elements/pipeline-elements-all-flink-deployment.yaml
b/installer/k8s/templates/extensions/pipeline-elements/pipeline-elements-all-flink-deployment.yaml
deleted file mode 100644
index c9ab5906b..000000000
---
a/installer/k8s/templates/extensions/pipeline-elements/pipeline-elements-all-flink-deployment.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-{{- if (eq .Values.deployment "full") }}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: pipeline-elements-all-flink
-spec:
- selector:
- matchLabels:
- app: pipeline-elements-all-flink
- replicas: 1
- template:
- metadata:
- labels:
- app: pipeline-elements-all-flink
- spec:
- containers:
- - name: pipeline-elements-all-flink
- image: {{ .Values.streampipes.registry
}}/pipeline-elements-all-flink:{{ .Values.streampipes.version }}
- imagePullPolicy: {{ .Values.pullPolicy }}
- ports:
- - containerPort: 8090
-{{- end }}
diff --git a/installer/k8s/templates/external/consul/consul-deployment.yaml
b/installer/k8s/templates/external/consul/consul-deployment.yaml
index 18fd60801..d494e8d58 100644
--- a/installer/k8s/templates/external/consul/consul-deployment.yaml
+++ b/installer/k8s/templates/external/consul/consul-deployment.yaml
@@ -16,24 +16,24 @@
apiVersion: apps/v1
kind: Deployment
metadata:
- name: consul
+ name: {{ .Values.external.consul.appName }}
spec:
selector:
matchLabels:
- app: consul
+ app: {{ .Values.external.consul.appName }}
replicas: 1
template:
metadata:
labels:
- app: consul
+ app: {{ .Values.external.consul.appName }}
spec:
volumes:
- - name: consul-pv
+ - name: {{ .Values.external.consul.persistence.pvName }}
persistentVolumeClaim:
- claimName: consul-pvc
+ claimName: {{ .Values.external.consul.persistence.claimName }}
containers:
- - name: consul
- image: consul:{{ .Values.external.consulVersion }}
+ - name: {{ .Values.external.consul.appName }}
+ image: consul:{{ .Values.external.consul.version }}
imagePullPolicy: {{ .Values.pullPolicy }}
command:
- "/bin/sh"
@@ -60,4 +60,4 @@ spec:
- containerPort: 8600
volumeMounts:
- mountPath: "/consul/data"
- name: consul-pv
+ name: {{ .Values.external.consul.persistence.pvName }}
diff --git a/installer/k8s/templates/external/consul/consul-pv-pvc.yaml
b/installer/k8s/templates/external/consul/consul-pv-pvc.yaml
index 02cba151d..34885196f 100644
--- a/installer/k8s/templates/external/consul/consul-pv-pvc.yaml
+++ b/installer/k8s/templates/external/consul/consul-pv-pvc.yaml
@@ -13,30 +13,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
-kind: PersistentVolume
-metadata:
- name: consul-pv
-spec:
- storageClassName: local-storage-consul
- capacity:
- storage: 20M
- accessModes:
- - {{ .Values.persistentVolumeAccessModes }}
- persistentVolumeReclaimPolicy: {{ .Values.persistentVolumeReclaimPolicy }}
- hostPath:
- path: {{ .Values.hostPath }}/consul
----
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
labels:
- app: consul
- name: consul-pvc
+ app: {{ .Values.external.consul.appName }}
+ name: {{ .Values.external.consul.persistence.claimName }}
spec:
- storageClassName: local-storage-consul
+ storageClassName: {{ .Values.external.consul.persistence.storageClassName }}
accessModes:
- {{ .Values.persistentVolumeAccessModes }}
resources:
requests:
- storage: 20M
\ No newline at end of file
+ storage: 20M
diff --git a/installer/k8s/templates/external/consul/consul-service.yaml
b/installer/k8s/templates/external/consul/consul-service.yaml
index 43ff32cba..a14104a0c 100644
--- a/installer/k8s/templates/external/consul/consul-service.yaml
+++ b/installer/k8s/templates/external/consul/consul-service.yaml
@@ -16,10 +16,10 @@
apiVersion: v1
kind: Service
metadata:
- name: consul
+ name: {{ .Values.external.consul.appName }}
spec:
selector:
- app: consul
+ app: {{ .Values.external.consul.appName }}
ports:
- name: main
protocol: TCP
@@ -28,4 +28,4 @@ spec:
- name: test
protocol: TCP
port: 8600
- targetPort: 8600
\ No newline at end of file
+ targetPort: 8600
diff --git a/installer/k8s/templates/external/couchdb/couchdb-deployment.yaml
b/installer/k8s/templates/external/couchdb/couchdb-deployment.yaml
index 368b44ed2..9e3eb670e 100644
--- a/installer/k8s/templates/external/couchdb/couchdb-deployment.yaml
+++ b/installer/k8s/templates/external/couchdb/couchdb-deployment.yaml
@@ -16,32 +16,32 @@
apiVersion: apps/v1
kind: Deployment
metadata:
- name: couchdb
+ name: {{ .Values.external.couchdb.appName }}
spec:
selector:
matchLabels:
- app: couchdb
+ app: {{ .Values.external.couchdb.appName }}
replicas: 1
template:
metadata:
labels:
- app: couchdb
+ app: {{ .Values.external.couchdb.appName }}
spec:
volumes:
- - name: couchdb-pv
+ - name: {{ .Values.external.couchdb.persistence.pvName }}
persistentVolumeClaim:
- claimName: couchdb-pvc
+ claimName: {{ .Values.external.couchdb.persistence.claimName }}
containers:
- - name: couchdb
- image: couchdb:{{ .Values.external.couchdbVersion }}
+ - name: {{ .Values.external.couchdb.appName }}
+ image: couchdb:{{ .Values.external.couchdb.version }}
imagePullPolicy: {{ .Values.pullPolicy }}
env:
- name: COUCHDB_USER
- value: "admin"
+ value: {{ .Values.external.couchdb.user }}
- name: COUCHDB_PASSWORD
- value: "admin"
+ value: {{ .Values.external.couchdb.password }}
ports:
- containerPort: 5984
volumeMounts:
- mountPath: "/opt/couchdb/data"
- name: couchdb-pv
+ name: {{ .Values.external.couchdb.persistence.pvName }}
diff --git a/installer/k8s/templates/external/couchdb/couchdb-pv-pvc.yaml
b/installer/k8s/templates/external/couchdb/couchdb-pv-pvc.yaml
index 32861e052..3b4152fef 100644
--- a/installer/k8s/templates/external/couchdb/couchdb-pv-pvc.yaml
+++ b/installer/k8s/templates/external/couchdb/couchdb-pv-pvc.yaml
@@ -13,30 +13,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
-kind: PersistentVolume
-metadata:
- name: couchdb-pv
-spec:
- storageClassName: local-storage-couchdb
- capacity:
- storage: 50M
- accessModes:
- - {{ .Values.persistentVolumeAccessModes }}
- persistentVolumeReclaimPolicy: {{ .Values.persistentVolumeReclaimPolicy }}
- hostPath:
- path: {{ .Values.hostPath }}/couchdb
----
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
labels:
- app: couchdb
- name: couchdb-pvc
+ app: {{ .Values.external.couchdb.appName }}
+ name: {{ .Values.external.couchdb.persistence.claimName }}
spec:
- storageClassName: local-storage-couchdb
+ storageClassName: {{ .Values.external.couchdb.persistence.storageClassName }}
accessModes:
- {{ .Values.persistentVolumeAccessModes }}
resources:
requests:
- storage: 50M
\ No newline at end of file
+ storage: 50M
diff --git a/installer/k8s/templates/external/couchdb/couchdb-service.yaml
b/installer/k8s/templates/external/couchdb/couchdb-service.yaml
index a5ca14248..3b126c521 100644
--- a/installer/k8s/templates/external/couchdb/couchdb-service.yaml
+++ b/installer/k8s/templates/external/couchdb/couchdb-service.yaml
@@ -16,12 +16,12 @@
apiVersion: v1
kind: Service
metadata:
- name: couchdb
+ name: {{ .Values.external.couchdb.appName }}
spec:
selector:
- app: couchdb
+ app: {{ .Values.external.couchdb.appName }}
ports:
- name: main
protocol: TCP
port: 5984
- targetPort: 5984
\ No newline at end of file
+ targetPort: 5984
diff --git a/installer/k8s/templates/external/flink/jobmanager-deployment.yaml
b/installer/k8s/templates/external/flink/jobmanager-deployment.yaml
deleted file mode 100644
index e23aec26f..000000000
--- a/installer/k8s/templates/external/flink/jobmanager-deployment.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-{{- if eq .Values.deployment "full" }}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: jobmanager
-spec:
- selector:
- matchLabels:
- app: jobmanager
- replicas: 1
- template:
- metadata:
- labels:
- app: jobmanager
- spec:
- containers:
- - name: jobmanager
- image: fogsyio/flink:{{ .Values.external.flinkVersion }}
- imagePullPolicy: {{ .Values.pullPolicy }}
- args: ["jobmanager"]
- ports:
- - containerPort: 8081
- name: webui
- - containerPort: 6123
- name: rpc
- - containerPort: 6124
- name: blob-server
- env:
- - name: JOB_MANAGER_RPC_ADDRESS
- value: jobmanager
-{{- end }}
diff --git a/installer/k8s/templates/external/flink/jobmanager-service.yaml
b/installer/k8s/templates/external/flink/jobmanager-service.yaml
deleted file mode 100644
index 6c7ec7742..000000000
--- a/installer/k8s/templates/external/flink/jobmanager-service.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-{{- if eq .Values.deployment "full" }}
-apiVersion: v1
-kind: Service
-metadata:
- name: jobmanager
-spec:
- selector:
- app: jobmanager
- ports:
- - name: webui
- port: 8081
- targetPort: 8081
- - name: rpc
- port: 6123
- targetPort: 6123
- - name: blob-server
- port: 6124
- targetPort: 6124
-{{- end }}
diff --git a/installer/k8s/templates/external/flink/taskmanager-deployment.yaml
b/installer/k8s/templates/external/flink/taskmanager-deployment.yaml
deleted file mode 100644
index d172acf46..000000000
--- a/installer/k8s/templates/external/flink/taskmanager-deployment.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-{{- if eq .Values.deployment "full" }}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: taskmanager
-spec:
- selector:
- matchLabels:
- app: taskmanager
- replicas: 1
- template:
- metadata:
- labels:
- app: taskmanager
- spec:
- containers:
- - name: taskmanager
- image: fogsyio/flink:{{ .Values.external.flinkVersion }}
- imagePullPolicy: {{ .Values.pullPolicy }}
- args: ["taskmanager"]
- ports:
- - containerPort: 8099
- env:
- - name: TASK_MANAGER_NUMBER_OF_TASK_SLOTS
- value: "20"
- - name: JOB_MANAGER_RPC_ADDRESS
- value: jobmanager
-{{- end }}
diff --git a/installer/k8s/templates/external/influxdb/influxdb-deployment.yaml
b/installer/k8s/templates/external/influxdb/influxdb-deployment.yaml
index ffb7da328..e1905c89f 100644
--- a/installer/k8s/templates/external/influxdb/influxdb-deployment.yaml
+++ b/installer/k8s/templates/external/influxdb/influxdb-deployment.yaml
@@ -16,27 +16,27 @@
apiVersion: apps/v1
kind: Deployment
metadata:
- name: influxdb
+ name: {{ .Values.external.influxdb.appName }}
spec:
selector:
matchLabels:
- app: influxdb
+ app: {{ .Values.external.influxdb.appName }}
replicas: 1
template:
metadata:
labels:
- app: influxdb
+ app: {{ .Values.external.influxdb.appName }}
spec:
volumes:
- - name: influxdb-pv
+ - name: {{ .Values.external.influxdb.persistence.pvNameV1 }}
persistentVolumeClaim:
- claimName: influxdb-pvc
- - name: influxdb2-pv
+ claimName: {{ .Values.external.influxdb.persistence.claimNameV1 }}
+ - name: {{ .Values.external.influxdb.persistence.pvName }}
persistentVolumeClaim:
- claimName: influxdb2-pvc
+ claimName: {{ .Values.external.influxdb.persistence.claimName }}
containers:
- - name: influxdb
- image: influxdb:{{ .Values.external.influxdbVersion }}
+ - name: {{ .Values.external.influxdb.appName }}
+ image: influxdb:{{ .Values.external.influxdb.version }}
imagePullPolicy: {{ .Values.pullPolicy }}
ports:
- containerPort: 8083
@@ -50,19 +50,19 @@ spec:
- name: INFLUXDB_ADMIN_ENABLED
value: "true"
- name: DOCKER_INFLUXDB_INIT_USERNAME
- value: {{ .Values.influxdb.username }}
+ value: {{ .Values.external.influxdb.username }}
- name: DOCKER_INFLUXDB_INIT_PASSWORD
- value: {{ .Values.influxdb.password }}
+ value: {{ .Values.external.influxdb.password }}
- name: DOCKER_INFLUXDB_INIT_ADMIN_TOKEN
- value: {{ .Values.influxdb.adminToken }}
+ value: {{ .Values.external.influxdb.adminToken }}
- name: DOCKER_INFLUXDB_INIT_ORG
- value: {{ .Values.influxdb.initOrg }}
+ value: {{ .Values.external.influxdb.initOrg }}
- name: DOCKER_INFLUXDB_INIT_BUCKET
- value: {{ .Values.influxdb.initBucket }}
+ value: {{ .Values.external.influxdb.initBucket }}
- name: DOCKER_INFLUXDB_INIT_MODE
- value: {{ .Values.influxdb.initMode }}
+ value: {{ .Values.external.influxdb.initMode }}
volumeMounts:
- mountPath: "/var/lib/influxdb"
- name: influxdb-pv
+ name: {{ .Values.external.influxdb.persistence.pvNameV1 }}
- mountPath: "/var/lib/influxdb2"
- name: influxdb2-pv
+ name: {{ .Values.external.influxdb.persistence.pvName }}
diff --git a/installer/k8s/templates/external/influxdb/influxdb-pvc.yaml
b/installer/k8s/templates/external/influxdb/influxdb-pvc.yaml
index fbcb64a71..1e6add053 100644
--- a/installer/k8s/templates/external/influxdb/influxdb-pvc.yaml
+++ b/installer/k8s/templates/external/influxdb/influxdb-pvc.yaml
@@ -13,28 +13,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
-kind: PersistentVolume
-metadata:
- name: influx-pv
-spec:
- storageClassName: local-storage-influx
- capacity:
- storage: 250Mi
- accessModes:
- - {{ .Values.persistentVolumeAccessModes }}
- persistentVolumeReclaimPolicy: {{ .Values.persistentVolumeReclaimPolicy }}
- hostPath:
- path: {{ .Values.hostPath }}/influxdb
----
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
labels:
- app: influxdb
- name: influxdb-pvc
+ app: {{ .Values.external.influxdb.appName }}
+ name: {{ .Values.external.influxdb.persistence.claimNameV1 }}
spec:
- storageClassName: local-storage-influx
+ storageClassName: {{ .Values.external.influxdb.persistence.storageClassName
}}
accessModes:
- {{ .Values.persistentVolumeAccessModes }}
resources:
diff --git a/installer/k8s/templates/external/influxdb/influxdb-service.yaml
b/installer/k8s/templates/external/influxdb/influxdb-service.yaml
index cfeb4135b..986430f10 100644
--- a/installer/k8s/templates/external/influxdb/influxdb-service.yaml
+++ b/installer/k8s/templates/external/influxdb/influxdb-service.yaml
@@ -16,10 +16,10 @@
apiVersion: v1
kind: Service
metadata:
- name: influxdb
+ name: {{ .Values.external.influxdb.appName }}
spec:
selector:
- app: influxdb
+ app: {{ .Values.external.influxdb.appName }}
ports:
- name: main
protocol: TCP
diff --git a/installer/k8s/templates/external/influxdb/influxdb2-pvc.yaml
b/installer/k8s/templates/external/influxdb/influxdb2-pvc.yaml
index 2e71d79d6..dada18938 100644
--- a/installer/k8s/templates/external/influxdb/influxdb2-pvc.yaml
+++ b/installer/k8s/templates/external/influxdb/influxdb2-pvc.yaml
@@ -13,28 +13,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
-kind: PersistentVolume
-metadata:
- name: influx2-pv
-spec:
- storageClassName: local-storage-influx2
- capacity:
- storage: 250Mi
- accessModes:
- - {{ .Values.persistentVolumeAccessModes }}
- persistentVolumeReclaimPolicy: {{ .Values.persistentVolumeReclaimPolicy }}
- hostPath:
- path: {{ .Values.hostPath }}/influxdb2
----
+
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
labels:
- app: influxdb
- name: influxdb2-pvc
+ app: {{ .Values.external.influxdb.appName }}
+ name: {{ .Values.external.influxdb.persistence.claimName }}
spec:
- storageClassName: local-storage-influx2
+ storageClassName: {{ .Values.external.influxdb.persistence.storageClassName
}}
accessModes:
- {{ .Values.persistentVolumeAccessModes }}
resources:
diff --git a/installer/k8s/templates/external/nats/nats-deployment.yaml
b/installer/k8s/templates/external/nats/nats-deployment.yaml
index 7c6860825..4f57e9a03 100644
--- a/installer/k8s/templates/external/nats/nats-deployment.yaml
+++ b/installer/k8s/templates/external/nats/nats-deployment.yaml
@@ -17,23 +17,23 @@
apiVersion: apps/v1
kind: Deployment
metadata:
- name: nats
+ name: {{ .Values.external.nats.appName }}
spec:
selector:
matchLabels:
- app: nats
+ app: {{ .Values.external.nats.appName }}
replicas: 1
template:
metadata:
labels:
- app: nats
+ app: {{ .Values.external.nats.appName }}
spec:
initContainers:
- name: init-wait-consul
image: alpine
command: ["sh", "-c", "for i in $(seq 1 300); do nc -zvw1 consul
8500 && exit 0 || sleep 3; done; exit 1"]
containers:
- - name: nats
+ - name: {{ .Values.external.nats.appName }}
image: nats
imagePullPolicy: {{ .Values.pullPolicy }}
ports:
diff --git a/installer/k8s/templates/external/nats/nats-service.yaml
b/installer/k8s/templates/external/nats/nats-service.yaml
index a243534dd..cfc9d3f8b 100644
--- a/installer/k8s/templates/external/nats/nats-service.yaml
+++ b/installer/k8s/templates/external/nats/nats-service.yaml
@@ -23,6 +23,8 @@ metadata:
spec:
selector:
app: nats
+ type: {{ .Values.external.nats.service.type }}
+ externalTrafficPolicy: {{
.Values.external.nats.service.externalTrafficPolicy }}
ports:
- name: main
protocol: TCP
diff --git a/installer/k8s/values.yaml b/installer/k8s/values.yaml
index 07edd3dbf..3dfbde6b9 100644
--- a/installer/k8s/values.yaml
+++ b/installer/k8s/values.yaml
@@ -16,35 +16,91 @@
# lite or full (default: lite)
deployment: lite
preferredBroker: "nats"
-pullPolicy: "IfNotPresent"
+pullPolicy: "Always"
persistentVolumeReclaimPolicy: "Delete"
persistentVolumeAccessModes: "ReadWriteOnce"
streampipes:
version: "0.92.0-SNAPSHOT"
registry: "apachestreampipes"
+ core:
+ appName: "backend"
+ port: 8030
+ persistence:
+ storageClassName: ""
+ claimName: "backend-pvc"
+ pvName: "backend-pv"
+ service:
+ name: "backend"
+ port: 8030
+ ui:
+ appName: "ui"
+ resolverActive: true
+ # DNS resolver when using the Nginx proxy
+ resolver: "kube-dns.kube-system.svc.cluster.local"
+ service:
+ name: "ui"
+ type: "ClusterIP"
+ nodePort: 8088
+ port: 8088
+ port: 8088
+ ingress:
+ active: false
+ annotations: {}
+ #className: ""
+ host: ""
+ # Ingressroute for running StreamPipes behind Traefik
+ ingressroute:
+ active: false
+ annotations: {}
+ entryPoints:
+ - web
+ - websecure
+ host: ""
+ certResolverActive: true
+ certResolver: ""
external:
- consulVersion: 1.14.3
- couchdbVersion: 3.3.1
- flinkVersion: 1.13.5-scala_2.11
+ consul:
+ appName: "consul"
+ version: 1.14.3
+ persistence:
+ storageClassName: ""
+ claimName: "consul-pvc"
+ pvName: "consul-pv"
+ couchdb:
+ appName: "couchdb"
+ version: 3.3.1
+ user: "admin"
+ password: "admin"
+ persistence:
+ storageClassName: ""
+ claimName: "couchdb-pvc"
+ pvName: "couchdb-pv"
+ influxdb:
+ appName: "influxdb"
+ version: 2.6
+ username: "admin"
+ password: "sp-admin"
+ adminToken: "sp-admin"
+ initOrg: "sp"
+ initBucket: "sp"
+ # For database migration in v0.91.0 - set init mode to 'upgrade' to
migrate an existing installation
+ initMode: "setup"
+ persistence:
+ storageClassName: ""
+ claimName: "influxdb2-pvc"
+ claimNameV1: "influxdb-pvc"
+ pvName: "influxdb2-pv"
+ pvNameV1: "influxdb-pv"
+ nats:
+ appName: "nats"
+ service:
+ type: "NodePort"
+ externalTrafficPolicy: "Local"
+ version:
kafkaVersion: 2.2.0
zookeeperVersion: 3.4.13
- influxdbVersion: 2.6
-# For database migration in v0.91.0 - set init mode to 'upgrade' to migrate an
existing installation
-influxdb:
- username: "admin"
- password: "sp-admin"
- adminToken: "sp-admin"
- initOrg: "sp"
- initBucket: "sp"
- initMode: "setup"
-
-
-# NOTE: Local testing only!
-# minikube start --mount-string ${HOME}/streampipes-k8s:/streampipes-k8s
--mount --memory=4g --cpus=4
-# Specify minikube directory:
-hostPath: "/streampipes-k8s"
diff --git a/ui/Dockerfile b/ui/Dockerfile
index e89d89332..0bbc4af52 100644
--- a/ui/Dockerfile
+++ b/ui/Dockerfile
@@ -17,13 +17,21 @@ FROM nginx
COPY dist/streampipes/ui/ /usr/share/nginx/html/
+
+RUN chown -R nginx:nginx /usr/share/nginx/html && chmod -R 755
/usr/share/nginx/html && \
+ chown -R nginx:nginx /var/cache/nginx && \
+ chown -R nginx:nginx /var/log/nginx && \
+ chown -R nginx:nginx /etc/nginx/conf.d
+RUN touch /var/run/nginx.pid && \
+ chown -R nginx:nginx /var/run/nginx.pid
+
+USER nginx
+
COPY nginx_config/nginx.conf /etc/nginx/nginx.conf
COPY nginx_config/default.conf /etc/nginx/conf.d/default.conf
COPY nginx_config/ssl.conf /app/nginx-confs/ssl.conf
COPY docker-entrypoint.sh /
-RUN chown -R nginx:nginx /usr/share/nginx/html/
-
ENTRYPOINT ["sh", "/docker-entrypoint.sh"]
CMD ["nginx", "-g", "daemon off;"]
diff --git a/ui/nginx_config/default.conf b/ui/nginx_config/default.conf
index 90002a6fe..5dd4447c2 100644
--- a/ui/nginx_config/default.conf
+++ b/ui/nginx_config/default.conf
@@ -14,7 +14,7 @@
# limitations under the License.
server {
- listen 80 default_server;
+ listen 8088 default_server;
resolver 127.0.0.11;
root /usr/share/nginx/html;
@@ -43,17 +43,6 @@ server {
proxy_redirect off;
}
- location /streampipes-connect/ {
- set $upstream backend:8030;
-
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-NginX-Proxy true;
- proxy_pass http://$upstream;
- proxy_ssl_session_reuse off;
- proxy_set_header Host $http_host;
- }
-
location ~/endpoints/(?<endpointName>.*)$ {
set $upstream connect-adapters-iiot:8001/api/v1/worker/live/$endpointName;
@@ -64,14 +53,4 @@ server {
proxy_ssl_session_reuse off;
proxy_set_header Host $http_host;
}
-
- #error_page 404 /404.html;
-
- # redirect server error pages to the static page /50x.html
- #
- #error_page 500 502 503 504 /50x.html;
- #location = /50x.html {
- # root /usr/share/nginx/html;
- #}
-
}
diff --git a/ui/nginx_config/ssl.conf b/ui/nginx_config/ssl.conf
index 8279fa586..c3a5fc133 100644
--- a/ui/nginx_config/ssl.conf
+++ b/ui/nginx_config/ssl.conf
@@ -14,7 +14,7 @@
# limitations under the License.
server {
- listen 80;
+ listen 8088;
return 301 https://$host$request_uri;
}
