This is an automated email from the ASF dual-hosted git repository.
zehnder 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 707eed26d Improve service name and port description (#1813)
707eed26d is described below
commit 707eed26d5f73b94222f91183cecbf56697693ee
Author: zhenyu luo <[email protected]>
AuthorDate: Sat Aug 5 12:39:13 2023 +0800
Improve service name and port description (#1813)
---
installer/k8s/README.md | 52 +++++++++++-----------
.../k8s/templates/core/backend-deployment.yaml | 2 +-
installer/k8s/templates/core/ui-deployment.yaml | 2 +-
.../external/consul/consul-deployment.yaml | 10 ++---
.../templates/external/consul/consul-service.yaml | 8 ++--
.../external/influxdb/influxdb-deployment.yaml | 12 ++---
.../external/influxdb/influxdb-service.yaml | 12 ++---
.../templates/external/nats/nats-deployment.yaml | 2 +-
installer/k8s/values.yaml | 24 +++++-----
9 files changed, 62 insertions(+), 62 deletions(-)
diff --git a/installer/k8s/README.md b/installer/k8s/README.md
index 56b4a8e2c..779b8174f 100644
--- a/installer/k8s/README.md
+++ b/installer/k8s/README.md
@@ -98,7 +98,7 @@ rm -rf ${HOME}/streampipes-k8s
| failureThreshold | Number of consecutive
failures for readiness probes | 30 |
| hostPath | Host path for the
application | ""
|
-###Streampipes common parameters
+###StreamPipes common parameters
| Parameter Name | Description
| Value |
|-------------------------------------------------|---------------------------------------------------------|------------------------------------------|
| streampipes.version | StreamPipes version
| "0.93.0-SNAPSHOT" |
@@ -110,7 +110,7 @@ rm -rf ${HOME}/streampipes-k8s
| streampipes.core.persistence.claimName | Name of the backend
PersistentVolumeClaim | "backend-pvc" |
| streampipes.core.persistence.pvName | Name of the backend
PersistentVolume | "backend-pv" |
| streampipes.core.service.name | Name of the backend
service | "backend" |
-| streampipes.core.service.port | Port for the backend
service | 8030 |
+| streampipes.core.service.port | TargetPort of the
StreamPipes backend service | 8030
|
| streampipes.ui.appName | StreamPipes UI application
name | "ui" |
| streampipes.ui.resolverActive | Flag for enabling DNS
resolver for Nginx proxy | true |
| streampipes.ui.port | StreamPipes UI port
| 8088 |
@@ -118,7 +118,7 @@ rm -rf ${HOME}/streampipes-k8s
| streampipes.ui.service.name | Name of the UI service
| "ui" |
| streampipes.ui.service.type | Type of the UI service
| "ClusterIP" |
| streampipes.ui.service.nodePort | Node port for the UI
service | 8088 |
-| streampipes.ui.service.port | Port for the UI service
| 8088 |
+| streampipes.ui.service.port | TargetPort of the
StreamPipes UI service | 8088
|
| streampipes.ingress.active | Flag for enabling Ingress
for StreamPipes | false |
| streampipes.ingress.annotations | Annotations for Ingress
| {} |
| streampipes.ingress.host | Hostname for Ingress
| "" |
@@ -135,37 +135,37 @@ rm -rf ${HOME}/streampipes-k8s
|-------------------------------------------------|---------------------------------------------------------|------------------------------------------|
| extensions.iiot.appName | IIoT extensions
application name | extensions-all-iiot
|
| extensions.iiot.port | Port for the IIoT
extensions application | 8090
|
-| extensions.iiot.service.name | Name of the IIoT
extensions service | extensions-all-iiot1
|
-| extensions.iiot.service.port | Port for the IIoT
extensions service | 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 |
###External common parameters
####Consul common parameters
| Parameter Name | Description
| Value |
-|-------------------------------------------------|----------------------------------------------------------|-----------------|
+|-------------------------------------------------|----------------------------------------------------------|------------------------------------------|
| external.consul.appName | Consul application name
| "consul" |
| external.consul.version | Consul version
| 1.14.3 |
-| external.consul.port1 | Port 1 for Consul service
| 8500 |
-| external.consul.port2 | Port 2 for Consul service
| 8600 |
+| external.consul.webPort | Port number for the Consul
web interface | 8500 |
+| external.consul.dnsPort | Port number for the Consul
DNS interface | 8600 |
| external.consul.persistence.storageClassName | Storage class name for
Consul PVs | "hostpath" |
| external.consul.persistence.storageSize | Size of the Consul PV
| "1Gi" |
| external.consul.persistence.claimName | Name of the Consul
PersistentVolumeClaim | "consul-pvc"
|
| external.consul.persistence.pvName | Name of the Consul
PersistentVolume | "consul-pv"
|
| external.consul.service.name | Name of the Consul service
| "consul" |
-| external.consul.service.port1 | Port 1 for the Consul
service | 8500 |
-| external.consul.service.port2 | Port 2 for the Consul
service | 8600 |
+| external.consul.service.webPort | TargetPort of the Consul
service for web interface | 8500 |
+| external.consul.service.dnsPort | TargetPort of the Consul
service for DNS interface | 8600 |
####Couchdb common parameters
| Parameter Name | Description
| Value |
-|-------------------------------------------------|----------------------------------------------------------|-----------------|
+|-------------------------------------------------|----------------------------------------------------------|------------------------------------------|
| external.couchdb.appName | CouchDB application name
| "couchdb" |
| external.couchdb.version | CouchDB version
| 3.3.1 |
| external.couchdb.user | CouchDB admin username
| "admin" |
| external.couchdb.password | CouchDB admin password
| "admin" |
| external.couchdb.port | Port for the CouchDB
service | 5984 |
| external.couchdb.service.name | Name of the CouchDB
service | "couchdb"
|
-| external.couchdb.service.port | Port for the CouchDB
service | 5984 |
+| external.couchdb.service.port | TargetPort of the CouchDB
service | 5984 |
| external.couchdb.persistence.storageClassName | Storage class name for
CouchDB PVs | "hostpath" |
| external.couchdb.persistence.storageSize | Size of the CouchDB PV
| "1Gi" |
| external.couchdb.persistence.claimName | Name of the CouchDB
PersistentVolumeClaim | "couchdb-pvc"
|
@@ -173,7 +173,7 @@ rm -rf ${HOME}/streampipes-k8s
####Influxdb common parameters
| Parameter Name | Description
| Value |
-|-------------------------------------------------|----------------------------------------------------------|-----------------|
+|-------------------------------------------------|----------------------------------------------------------|------------------------------------------|
| external.influxdb.appName | InfluxDB application name
| "influxdb" |
| external.influxdb.version | InfluxDB version
| 2.6 |
| external.influxdb.username | InfluxDB admin username
| "admin" |
@@ -182,13 +182,13 @@ rm -rf ${HOME}/streampipes-k8s
| external.influxdb.initOrg | InfluxDB initial
organization | "sp"
|
| external.influxdb.initBucket | InfluxDB initial bucket
| "sp" |
| external.influxdb.initMode | InfluxDB initialization
mode | "setup" |
-| external.influxdb.port1 | Port 1 for the InfluxDB
service | 8083 |
-| external.influxdb.port2 | Port 2 for the InfluxDB
service | 8086 |
-| external.influxdb.port3 | Port 3 for the InfluxDB
service | 8090 |
+| external.influxdb.apiPort | Port number for the
InfluxDB service (API) | 8083
|
+| external.influxdb.httpPort | Port number for the
InfluxDB service (HTTP) | 8086
|
+| external.influxdb.grpcPort | Port number for the
InfluxDB service (gRPC) | 8090
|
| external.influxdb.service.name | Name of the InfluxDB
service | "influxdb" |
-| external.influxdb.service.port1 | Port 1 for the InfluxDB
service | 8083 |
-| external.influxdb.service.port2 | Port 2 for the InfluxDB
service | 8086 |
-| external.influxdb.service.port3 | Port 3 for the InfluxDB
service | 8090 |
+| external.influxdb.service.apiPort | TargetPort of the InfluxDB
service for API | 8083 |
+| external.influxdb.service.httpPort | TargetPort of the InfluxDB
service for HTTP | 8086 |
+| external.influxdb.service.grpcPort | TargetPort of the InfluxDB
service for gRPC | 8090 |
| external.influxdb.persistence.storageClassName | Storage class name for
InfluxDB PVs | "hostpath" |
| external.influxdb.persistence.storageSize | Size of the InfluxDB PV
| "1Gi" |
| external.influxdb.persistence.storageSizeV1 | Size of the InfluxDB PV
for v1 databases | "1Gi" |
@@ -200,24 +200,24 @@ rm -rf ${HOME}/streampipes-k8s
####Nats common parameters
| Parameter Name | Description
| Value |
-|-------------------------------------------------|----------------------------------------------------------|-----------------|
+|-------------------------------------------------|----------------------------------------------------------|------------------------------------------|
| external.nats.appName | NATS application name
| "nats" |
| external.nats.port | Port for the NATS service
| 4222 |
| external.nats.version | NATS version
| |
| external.nats.service.type | Type of the NATS service
| "NodePort" |
| external.nats.service.externalTrafficPolicy | External traffic policy
for the NATS service | "Local" |
-| external.nats.service.name | Name of the NATS service
| "nats1" |
-| external.nats.service.port | Port for the NATS service
| 4222 |
+| external.nats.service.name | Name of the NATS service
| "nats" |
+| external.nats.service.port | TargetPort of the NATS
service | 4222 |
####Kafka common parameters
| Parameter Name | Description
| Value |
-|-------------------------------------------------|----------------------------------------------------------|-----------------|
+|-------------------------------------------------|----------------------------------------------------------|------------------------------------------|
| external.kafka.appName | Kafka application name
| "kafka" |
| external.kafka.version | Kafka version
| 2.2.0 |
| external.kafka.port | Port for the Kafka service
| 9092 |
| external.kafka.service.name | Name of the Kafka service
| "kafka" |
-| external.kafka.service.port | Port for the Kafka service
| 9092 |
+| external.kafka.service.port | TargetPort of the Kafka
service | 9092 |
| external.kafka.persistence.storageClassName | Storage class name for
Kafka PVs | "hostpath" |
| external.kafka.persistence.storageSize | Size of the Kafka PV
| "1Gi" |
| external.kafka.persistence.claimName | Name of the Kafka
PersistentVolumeClaim | "kafka-pvc"
|
@@ -226,12 +226,12 @@ rm -rf ${HOME}/streampipes-k8s
####Zookeeper common parameters
| Parameter Name | Description
| Value |
-|-------------------------------------------------|----------------------------------------------------------|-----------------|
+|-------------------------------------------------|----------------------------------------------------------|------------------------------------------|
| external.zookeeper.appName | ZooKeeper application name
| "zookeeper" |
| external.zookeeper.version | ZooKeeper version
| 3.4.13 |
| external.zookeeper.port | Port for the ZooKeeper
service | 2181 |
| external.zookeeper.service.name | Name of the ZooKeeper
service | "zookeeper" |
-| external.zookeeper.service.port | Port for the ZooKeeper
service | 2181 |
+| external.zookeeper.service.port | TargetPort of the
ZooKeeper service | 2181
|
| external.zookeeper.persistence.storageClassName | Storage class name for
ZooKeeper PVs | "hostpath" |
| external.zookeeper.persistence.storageSize | Size of the ZooKeeper PV
| "1Gi" |
| external.zookeeper.persistence.claimName | Name of the ZooKeeper
PersistentVolumeClaim | "zookeeper-pvc" |
diff --git a/installer/k8s/templates/core/backend-deployment.yaml
b/installer/k8s/templates/core/backend-deployment.yaml
index 06580bd17..678828ef9 100644
--- a/installer/k8s/templates/core/backend-deployment.yaml
+++ b/installer/k8s/templates/core/backend-deployment.yaml
@@ -39,7 +39,7 @@ spec:
initContainers:
- name: init-wait-consul-couchdb
image: alpine
- command: ["sh", "-c", "for i in $(seq 1 300); do nc -zvw1 {{
.Values.external.consul.service.name }} {{
.Values.external.consul.service.port1 }} && nc -zvw1 {{
.Values.external.couchdb.service.name }} {{
.Values.external.couchdb.service.port }} && exit 0 || sleep 3; done; exit 1"]
+ command: ["sh", "-c", "for i in $(seq 1 300); do nc -zvw1 {{
.Values.external.consul.service.name }} {{
.Values.external.consul.service.webPort }} && nc -zvw1 {{
.Values.external.couchdb.service.name }} {{
.Values.external.couchdb.service.port }} && exit 0 || sleep 3; done; exit 1"]
containers:
- name: {{ .Values.streampipes.core.appName }}
image: {{ .Values.streampipes.registry }}/backend:{{
.Values.streampipes.version }}
diff --git a/installer/k8s/templates/core/ui-deployment.yaml
b/installer/k8s/templates/core/ui-deployment.yaml
index 0a09a5bfa..7383f0ce0 100644
--- a/installer/k8s/templates/core/ui-deployment.yaml
+++ b/installer/k8s/templates/core/ui-deployment.yaml
@@ -35,7 +35,7 @@ spec:
initContainers:
- name: init-wait-consul-couchdb-core
image: alpine
- command: ["sh", "-c", "for i in $(seq 1 300); do nc -zvw1
{{.Values.external.consul.service.name }}
{{.Values.external.consul.service.port1 }} && nc -zvw1
{{.Values.external.couchdb.service.name }}
{{.Values.external.couchdb.service.port }} && nc -zvw1
{{.Values.streampipes.core.service.name }}
{{.Values.streampipes.core.service.port }} && exit 0 || sleep 3; done; exit 1"]
+ command: ["sh", "-c", "for i in $(seq 1 300); do nc -zvw1
{{.Values.external.consul.service.name }}
{{.Values.external.consul.service.webPort }} && nc -zvw1
{{.Values.external.couchdb.service.name }}
{{.Values.external.couchdb.service.port }} && nc -zvw1
{{.Values.streampipes.core.service.name }}
{{.Values.streampipes.core.service.port }} && exit 0 || sleep 3; done; exit 1"]
containers:
- name: {{ .Values.streampipes.ui.appName }}
image: {{ .Values.streampipes.registry }}/ui:{{
.Values.streampipes.version }}
diff --git a/installer/k8s/templates/external/consul/consul-deployment.yaml
b/installer/k8s/templates/external/consul/consul-deployment.yaml
index 065f1515e..7b84ef8b2 100644
--- a/installer/k8s/templates/external/consul/consul-deployment.yaml
+++ b/installer/k8s/templates/external/consul/consul-deployment.yaml
@@ -57,29 +57,29 @@ spec:
- name: CONSUL_LOCAL_CONFIG
value: "{\"disable_update_check\": true}"
ports:
- - containerPort: {{ .Values.external.consul.port1 }}
- - containerPort: {{ .Values.external.consul.port2 }}
+ - containerPort: {{ .Values.external.consul.webPort }}
+ - containerPort: {{ .Values.external.consul.dnsPort }}
volumeMounts:
- mountPath: "/consul/data"
name: {{ .Values.external.consul.persistence.pvName }}
livenessProbe:
httpGet:
path: /v1/status/leader
- port: {{ .Values.external.consul.port1 }}
+ port: {{ .Values.external.consul.webPort }}
initialDelaySeconds: {{ .Values.initialDelaySeconds }}
periodSeconds: {{ .Values.periodSeconds }}
failureThreshold: {{ .Values.failureThreshold }}
readinessProbe:
httpGet:
path: /v1/status/leader
- port: {{ .Values.external.consul.port1 }}
+ port: {{ .Values.external.consul.webPort }}
initialDelaySeconds: {{ .Values.initialDelaySeconds }}
periodSeconds: {{ .Values.periodSeconds }}
failureThreshold: {{ .Values.failureThreshold }}
startupProbe:
httpGet:
path: /v1/status/leader
- port: {{ .Values.external.consul.port1 }}
+ port: {{ .Values.external.consul.webPort }}
initialDelaySeconds: {{ .Values.initialDelaySeconds }}
periodSeconds: {{ .Values.periodSeconds }}
failureThreshold: {{ .Values.failureThreshold }}
\ No newline at end of file
diff --git a/installer/k8s/templates/external/consul/consul-service.yaml
b/installer/k8s/templates/external/consul/consul-service.yaml
index 48aec18b3..6090b3ca8 100644
--- a/installer/k8s/templates/external/consul/consul-service.yaml
+++ b/installer/k8s/templates/external/consul/consul-service.yaml
@@ -23,9 +23,9 @@ spec:
ports:
- name: main
protocol: TCP
- port: {{ .Values.external.consul.port1 }}
- targetPort: {{ .Values.external.consul.service.port1 }}
+ port: {{ .Values.external.consul.webPort }}
+ targetPort: {{ .Values.external.consul.service.webPort }}
- name: test
protocol: TCP
- port: {{ .Values.external.consul.port2 }}
- targetPort: {{ .Values.external.consul.service.port2 }}
\ No newline at end of file
+ port: {{ .Values.external.consul.dnsPort }}
+ targetPort: {{ .Values.external.consul.service.dnsPort }}
\ No newline at end of file
diff --git a/installer/k8s/templates/external/influxdb/influxdb-deployment.yaml
b/installer/k8s/templates/external/influxdb/influxdb-deployment.yaml
index 3e6755edb..75c218e68 100644
--- a/installer/k8s/templates/external/influxdb/influxdb-deployment.yaml
+++ b/installer/k8s/templates/external/influxdb/influxdb-deployment.yaml
@@ -40,9 +40,9 @@ spec:
image: influxdb:{{ .Values.external.influxdb.version }}
imagePullPolicy: {{ .Values.pullPolicy }}
ports:
- - containerPort: {{ .Values.external.influxdb.port1 }}
- - containerPort: {{ .Values.external.influxdb.port2 }}
- - containerPort: {{ .Values.external.influxdb.port3 }}
+ - containerPort: {{ .Values.external.influxdb.apiPort }}
+ - containerPort: {{ .Values.external.influxdb.httpPort }}
+ - containerPort: {{ .Values.external.influxdb.grpcPort }}
env:
- name: INFLUXDB_DATA_ENGINE
value: "tsm1"
@@ -70,21 +70,21 @@ spec:
livenessProbe:
httpGet:
path: /ping
- port: {{ .Values.external.influxdb.port2 }}
+ port: {{ .Values.external.influxdb.httpPort }}
initialDelaySeconds: {{ .Values.initialDelaySeconds }}
periodSeconds: {{ .Values.periodSeconds }}
failureThreshold: {{ .Values.failureThreshold }}
readinessProbe:
httpGet:
path: /ping
- port: {{ .Values.external.influxdb.port2 }}
+ port: {{ .Values.external.influxdb.httpPort }}
initialDelaySeconds: {{ .Values.initialDelaySeconds }}
periodSeconds: {{ .Values.periodSeconds }}
failureThreshold: {{ .Values.failureThreshold }}
startupProbe:
httpGet:
path: /ping
- port: {{ .Values.external.influxdb.port2 }}
+ port: {{ .Values.external.influxdb.httpPort }}
initialDelaySeconds: {{ .Values.initialDelaySeconds }}
periodSeconds: {{ .Values.periodSeconds }}
failureThreshold: {{ .Values.failureThreshold }}
\ No newline at end of file
diff --git a/installer/k8s/templates/external/influxdb/influxdb-service.yaml
b/installer/k8s/templates/external/influxdb/influxdb-service.yaml
index b9902c4f8..0c7028dbf 100644
--- a/installer/k8s/templates/external/influxdb/influxdb-service.yaml
+++ b/installer/k8s/templates/external/influxdb/influxdb-service.yaml
@@ -23,13 +23,13 @@ spec:
ports:
- name: main
protocol: TCP
- port: {{ .Values.external.influxdb.port1 }}
- targetPort: {{ .Values.external.influxdb.service.port1 }}
+ port: {{ .Values.external.influxdb.apiPort }}
+ targetPort: {{ .Values.external.influxdb.service.apiPort }}
- name: api
protocol: TCP
- port: {{ .Values.external.influxdb.service.port2 }}
- targetPort: {{ .Values.external.influxdb.service.port2 }}
+ port: {{ .Values.external.influxdb.service.httpPort }}
+ targetPort: {{ .Values.external.influxdb.service.httpPort }}
- name: internal
protocol: TCP
- port: {{ .Values.external.influxdb.service.port3 }}
- targetPort: {{ .Values.external.influxdb.service.port3 }}
\ No newline at end of file
+ port: {{ .Values.external.influxdb.service.grpcPort }}
+ targetPort: {{ .Values.external.influxdb.service.grpcPort }}
\ No newline at end of file
diff --git a/installer/k8s/templates/external/nats/nats-deployment.yaml
b/installer/k8s/templates/external/nats/nats-deployment.yaml
index bafe09562..2d6ae4219 100644
--- a/installer/k8s/templates/external/nats/nats-deployment.yaml
+++ b/installer/k8s/templates/external/nats/nats-deployment.yaml
@@ -32,7 +32,7 @@ spec:
initContainers:
- name: init-wait-consul
image: alpine
- command: ["sh", "-c", "for i in $(seq 1 300); do nc -zvw1 {{
.Values.external.consul.appName }} {{ .Values.external.consul.port1 }} && exit
0 || sleep 3; done; exit 1"]
+ command: ["sh", "-c", "for i in $(seq 1 300); do nc -zvw1 {{
.Values.external.consul.appName }} {{ .Values.external.consul.webPort }} &&
exit 0 || sleep 3; done; exit 1"]
containers:
- name: {{ .Values.external.nats.appName }}
image: nats
diff --git a/installer/k8s/values.yaml b/installer/k8s/values.yaml
index c7755d8c9..1cd3d3f42 100644
--- a/installer/k8s/values.yaml
+++ b/installer/k8s/values.yaml
@@ -71,15 +71,15 @@ extensions:
appName: extensions-all-iiot
port: 8090
service:
- name: extensions-all-iiot1
+ name: extensions-all-iiot
port: 8090
external:
consul:
appName: "consul"
version: 1.14.3
- port1: 8500
- port2: 8600
+ webPort: 8500
+ dnsPort: 8600
persistence:
storageClassName: "hostpath"
storageSize: "1Gi"
@@ -87,8 +87,8 @@ external:
pvName: "consul-pv"
service:
name: "consul"
- port1: 8500
- port2: 8600
+ webPort: 8500
+ dnsPort: 8600
couchdb:
appName: "couchdb"
version: 3.3.1
@@ -113,14 +113,14 @@ external:
initBucket: "sp"
# For database migration in v0.91.0 - set init mode to 'upgrade' to
migrate an existing installation
initMode: "setup"
- port1: 8083
- port2: 8086
- port3: 8090
+ apiPort: 8083
+ httpPort: 8086
+ grpcPort: 8090
service:
name: "influxdb"
- port1: 8083
- port2: 8086
- port3: 8090
+ apiPort: 8083
+ httpPort: 8086
+ grpcPort: 8090
persistence:
storageClassName: "hostpath"
storageSize: "1Gi"
@@ -136,7 +136,7 @@ external:
service:
type: "NodePort"
externalTrafficPolicy: "Local"
- name: "nats1"
+ name: "nats"
port: 4222
kafka:
appName: "kafka"
