diff --git a/aws/microservices/database-setup.yml b/aws/microservices/database-setup.yml index 2b9df045..92d49457 100644 --- a/aws/microservices/database-setup.yml +++ b/aws/microservices/database-setup.yml @@ -34,7 +34,7 @@ spec: containers: - name: tb-db-setup imagePullPolicy: Always - image: thingsboard/tb-node:3.4.1 + image: thingsboard/tb-node:3.5.1 env: - name: TB_SERVICE_ID valueFrom: diff --git a/aws/microservices/k8s-upgrade-tb.sh b/aws/microservices/k8s-upgrade-tb.sh new file mode 100755 index 00000000..a97db5ea --- /dev/null +++ b/aws/microservices/k8s-upgrade-tb.sh @@ -0,0 +1,43 @@ +#!/bin/bash +# +# Copyright © 2016-2020 The Thingsboard Authors +# +# Licensed 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. +# + +for i in "$@" +do +case $i in + --fromVersion=*) + FROM_VERSION="${i#*=}" + shift + ;; + *) + # unknown option + ;; +esac +done + +if [[ -z "${FROM_VERSION// }" ]]; then + echo "--fromVersion parameter is invalid or unspecified!" + echo "Usage: k8s-upgrade-tb.sh --fromVersion={VERSION}" + exit 1 +else + fromVersion="${FROM_VERSION// }" +fi + +kubectl apply -f database-setup.yml && +kubectl wait --for=condition=Ready pod/tb-db-setup --timeout=120s && +kubectl exec tb-db-setup -- sh -c 'export UPGRADE_TB=true; export FROM_VERSION='"$fromVersion"'; start-tb-node.sh; touch /tmp/install-finished;' + +kubectl delete pod tb-db-setup diff --git a/aws/microservices/receipts/edge-load-balancer.yml b/aws/microservices/receipts/edge-load-balancer.yml new file mode 100644 index 00000000..107bcffa --- /dev/null +++ b/aws/microservices/receipts/edge-load-balancer.yml @@ -0,0 +1,23 @@ +apiVersion: v1 +kind: Service +metadata: + name: tb-edge-loadbalancer + namespace: thingsboard + annotations: + service.beta.kubernetes.io/aws-load-balancer-type: "nlb" + service.beta.kubernetes.io/aws-load-balancer-cross-zone-load-balancing-enabled: "true" + service.beta.kubernetes.io/aws-load-balancer-target-group-attributes: "stickiness.enabled=true,stickiness.type=source_ip" + service.beta.kubernetes.io/aws-load-balancer-additional-resource-tags: ThingsBoardClusterELB=ThingsBoardGrpc + # Don't forget to replace YOUR_GRPC_CERTIFICATE_ARN with the correct value. + # OR comment/remove the following lines to disable TLS. + service.beta.kubernetes.io/aws-load-balancer-ssl-cert: YOUR_GRPC_CERTIFICATE_ARN + service.beta.kubernetes.io/aws-load-balancer-ssl-ports: "7070" +spec: + type: LoadBalancer + externalTrafficPolicy: Local + selector: + app: tb-node + ports: + - port: 7070 + targetPort: 7070 + name: edge diff --git a/aws/microservices/tb-services.yml b/aws/microservices/tb-services.yml index c02686f5..102721d9 100644 --- a/aws/microservices/tb-services.yml +++ b/aws/microservices/tb-services.yml @@ -60,7 +60,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-node:3.4.1 + image: thingsboard/tb-node:3.5.1 ports: - containerPort: 8080 name: http @@ -169,7 +169,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-web-ui:3.4.1 + image: thingsboard/tb-web-ui:3.5.1 ports: - containerPort: 8080 name: http @@ -193,6 +193,8 @@ spec: value: "logs" - name: LOGGER_FILENAME value: "tb-web-ui-%DATE%.log" + - name: NODE_OPTIONS + value: "--max-old-space-size=100" - name: DOCKER_MODE value: "true" livenessProbe: @@ -236,7 +238,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-js-executor:3.4.1 + image: thingsboard/tb-js-executor:3.5.1 resources: limits: cpu: "100m" @@ -257,6 +259,8 @@ spec: value: "true" - name: SCRIPT_BODY_TRACE_FREQUENCY value: "1000" + - name: NODE_OPTIONS + value: "--max-old-space-size=200" envFrom: - configMapRef: name: tb-kafka-config diff --git a/aws/microservices/transports/tb-coap-transport.yml b/aws/microservices/transports/tb-coap-transport.yml index 69035730..8b617336 100644 --- a/aws/microservices/transports/tb-coap-transport.yml +++ b/aws/microservices/transports/tb-coap-transport.yml @@ -88,7 +88,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-coap-transport:3.4.1 + image: thingsboard/tb-coap-transport:3.5.1 ports: - containerPort: 5683 name: coap diff --git a/aws/microservices/transports/tb-http-transport.yml b/aws/microservices/transports/tb-http-transport.yml index c52963c2..34feb81c 100644 --- a/aws/microservices/transports/tb-http-transport.yml +++ b/aws/microservices/transports/tb-http-transport.yml @@ -88,7 +88,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-http-transport:3.4.1 + image: thingsboard/tb-http-transport:3.5.1 ports: - containerPort: 8080 name: http @@ -108,6 +108,8 @@ spec: value: "true" - name: ZOOKEEPER_URL value: "zookeeper:2181" + - name: HTTP_BIND_PORT + value: "8080" envFrom: - configMapRef: name: tb-kafka-config diff --git a/aws/microservices/transports/tb-lwm2m-transport.yml b/aws/microservices/transports/tb-lwm2m-transport.yml index ec53a179..9048a3ed 100644 --- a/aws/microservices/transports/tb-lwm2m-transport.yml +++ b/aws/microservices/transports/tb-lwm2m-transport.yml @@ -88,7 +88,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-lwm2m-transport:3.4.1 + image: thingsboard/tb-lwm2m-transport:3.5.1 ports: - containerPort: 5685 name: lwm2m diff --git a/aws/microservices/transports/tb-mqtt-transport.yml b/aws/microservices/transports/tb-mqtt-transport.yml index dc87bb58..e3dcc27c 100644 --- a/aws/microservices/transports/tb-mqtt-transport.yml +++ b/aws/microservices/transports/tb-mqtt-transport.yml @@ -97,7 +97,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-mqtt-transport:3.4.1 + image: thingsboard/tb-mqtt-transport:3.5.1 ports: - containerPort: 1883 name: mqtt diff --git a/aws/microservices/transports/tb-snmp-transport.yml b/aws/microservices/transports/tb-snmp-transport.yml index f5daae27..08563c2c 100644 --- a/aws/microservices/transports/tb-snmp-transport.yml +++ b/aws/microservices/transports/tb-snmp-transport.yml @@ -88,7 +88,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-snmp-transport:3.4.1 + image: thingsboard/tb-snmp-transport:3.5.1 resources: limits: cpu: "1000m" diff --git a/aws/monolith/database-setup.yml b/aws/monolith/database-setup.yml index 2b9df045..92d49457 100644 --- a/aws/monolith/database-setup.yml +++ b/aws/monolith/database-setup.yml @@ -34,7 +34,7 @@ spec: containers: - name: tb-db-setup imagePullPolicy: Always - image: thingsboard/tb-node:3.4.1 + image: thingsboard/tb-node:3.5.1 env: - name: TB_SERVICE_ID valueFrom: diff --git a/aws/monolith/receipts/edge-load-balancer.yml b/aws/monolith/receipts/edge-load-balancer.yml index bb6bc0ac..107bcffa 100644 --- a/aws/monolith/receipts/edge-load-balancer.yml +++ b/aws/monolith/receipts/edge-load-balancer.yml @@ -1,14 +1,15 @@ apiVersion: v1 kind: Service metadata: - name: tb-grpc-loadbalancer-external + name: tb-edge-loadbalancer namespace: thingsboard annotations: service.beta.kubernetes.io/aws-load-balancer-type: "nlb" service.beta.kubernetes.io/aws-load-balancer-cross-zone-load-balancing-enabled: "true" service.beta.kubernetes.io/aws-load-balancer-target-group-attributes: "stickiness.enabled=true,stickiness.type=source_ip" service.beta.kubernetes.io/aws-load-balancer-additional-resource-tags: ThingsBoardClusterELB=ThingsBoardGrpc - # Don't forget to replace YOUR_GRPC_CERTIFICATE_ARN with the correct value. Comment the following lines to disable TLS. + # Don't forget to replace YOUR_GRPC_CERTIFICATE_ARN with the correct value. + # OR comment/remove the following lines to disable TLS. service.beta.kubernetes.io/aws-load-balancer-ssl-cert: YOUR_GRPC_CERTIFICATE_ARN service.beta.kubernetes.io/aws-load-balancer-ssl-ports: "7070" spec: @@ -19,4 +20,4 @@ spec: ports: - port: 7070 targetPort: 7070 - name: edge \ No newline at end of file + name: edge diff --git a/aws/monolith/tb-node.yml b/aws/monolith/tb-node.yml index b91d4026..01b7a3bf 100644 --- a/aws/monolith/tb-node.yml +++ b/aws/monolith/tb-node.yml @@ -69,7 +69,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-node:3.4.1 + image: thingsboard/tb-node:3.5.1 ports: - containerPort: 8080 name: http diff --git a/azure/microservices/database-setup.yml b/azure/microservices/database-setup.yml index 2b9df045..92d49457 100644 --- a/azure/microservices/database-setup.yml +++ b/azure/microservices/database-setup.yml @@ -34,7 +34,7 @@ spec: containers: - name: tb-db-setup imagePullPolicy: Always - image: thingsboard/tb-node:3.4.1 + image: thingsboard/tb-node:3.5.1 env: - name: TB_SERVICE_ID valueFrom: diff --git a/azure/microservices/receipts/edge-load-balancer.yml b/azure/microservices/receipts/edge-load-balancer.yml new file mode 100644 index 00000000..af9a8192 --- /dev/null +++ b/azure/microservices/receipts/edge-load-balancer.yml @@ -0,0 +1,16 @@ +apiVersion: v1 +kind: Service +metadata: + name: tb-edge-loadbalancer + namespace: thingsboard + annotations: + service.beta.kubernetes.io/azure-load-balancer-internal: "false" +spec: + type: LoadBalancer + externalTrafficPolicy: Local + selector: + app: tb-node + ports: + - port: 7070 + targetPort: 7070 + name: edge diff --git a/azure/microservices/tb-services.yml b/azure/microservices/tb-services.yml index 015dc123..fabc5113 100644 --- a/azure/microservices/tb-services.yml +++ b/azure/microservices/tb-services.yml @@ -58,7 +58,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-node:3.4.1 + image: thingsboard/tb-node:3.5.1 ports: - containerPort: 8080 name: http @@ -161,7 +161,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-web-ui:3.4.1 + image: thingsboard/tb-web-ui:3.5.1 ports: - containerPort: 8080 name: http @@ -185,6 +185,8 @@ spec: value: "logs" - name: LOGGER_FILENAME value: "tb-web-ui-%DATE%.log" + - name: NODE_OPTIONS + value: "--max-old-space-size=100" - name: DOCKER_MODE value: "true" livenessProbe: @@ -226,7 +228,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-js-executor:3.4.1 + image: thingsboard/tb-js-executor:3.5.1 resources: limits: cpu: "100m" @@ -247,6 +249,8 @@ spec: value: "true" - name: SCRIPT_BODY_TRACE_FREQUENCY value: "1000" + - name: NODE_OPTIONS + value: "--max-old-space-size=200" envFrom: - configMapRef: name: tb-kafka-config diff --git a/azure/microservices/thirdparty.yml b/azure/microservices/thirdparty.yml index 034361f7..ca425cc3 100644 --- a/azure/microservices/thirdparty.yml +++ b/azure/microservices/thirdparty.yml @@ -307,7 +307,7 @@ spec: - ReadWriteOnce resources: requests: - storage: 200Mi + storage: 10Gi - metadata: name: app-logs spec: diff --git a/azure/microservices/transports/tb-coap-transport.yml b/azure/microservices/transports/tb-coap-transport.yml index 69035730..8b617336 100644 --- a/azure/microservices/transports/tb-coap-transport.yml +++ b/azure/microservices/transports/tb-coap-transport.yml @@ -88,7 +88,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-coap-transport:3.4.1 + image: thingsboard/tb-coap-transport:3.5.1 ports: - containerPort: 5683 name: coap diff --git a/azure/microservices/transports/tb-http-transport.yml b/azure/microservices/transports/tb-http-transport.yml index aafbbecc..6cfb8c56 100644 --- a/azure/microservices/transports/tb-http-transport.yml +++ b/azure/microservices/transports/tb-http-transport.yml @@ -88,7 +88,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-http-transport:3.4.1 + image: thingsboard/tb-http-transport:3.5.1 ports: - containerPort: 8080 name: http diff --git a/azure/microservices/transports/tb-lwm2m-transport.yml b/azure/microservices/transports/tb-lwm2m-transport.yml index ec53a179..9048a3ed 100644 --- a/azure/microservices/transports/tb-lwm2m-transport.yml +++ b/azure/microservices/transports/tb-lwm2m-transport.yml @@ -88,7 +88,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-lwm2m-transport:3.4.1 + image: thingsboard/tb-lwm2m-transport:3.5.1 ports: - containerPort: 5685 name: lwm2m diff --git a/azure/microservices/transports/tb-mqtt-transport.yml b/azure/microservices/transports/tb-mqtt-transport.yml index 62205453..69539a14 100644 --- a/azure/microservices/transports/tb-mqtt-transport.yml +++ b/azure/microservices/transports/tb-mqtt-transport.yml @@ -95,7 +95,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-mqtt-transport:3.4.1 + image: thingsboard/tb-mqtt-transport:3.5.1 ports: - containerPort: 1883 name: mqtt diff --git a/azure/microservices/transports/tb-snmp-transport.yml b/azure/microservices/transports/tb-snmp-transport.yml index f5daae27..08563c2c 100644 --- a/azure/microservices/transports/tb-snmp-transport.yml +++ b/azure/microservices/transports/tb-snmp-transport.yml @@ -88,7 +88,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-snmp-transport:3.4.1 + image: thingsboard/tb-snmp-transport:3.5.1 resources: limits: cpu: "1000m" diff --git a/azure/monolith/database-setup.yml b/azure/monolith/database-setup.yml index 2b9df045..92d49457 100644 --- a/azure/monolith/database-setup.yml +++ b/azure/monolith/database-setup.yml @@ -34,7 +34,7 @@ spec: containers: - name: tb-db-setup imagePullPolicy: Always - image: thingsboard/tb-node:3.4.1 + image: thingsboard/tb-node:3.5.1 env: - name: TB_SERVICE_ID valueFrom: diff --git a/azure/monolith/receipts/edge-load-balancer.yml b/azure/monolith/receipts/edge-load-balancer.yml new file mode 100644 index 00000000..af9a8192 --- /dev/null +++ b/azure/monolith/receipts/edge-load-balancer.yml @@ -0,0 +1,16 @@ +apiVersion: v1 +kind: Service +metadata: + name: tb-edge-loadbalancer + namespace: thingsboard + annotations: + service.beta.kubernetes.io/azure-load-balancer-internal: "false" +spec: + type: LoadBalancer + externalTrafficPolicy: Local + selector: + app: tb-node + ports: + - port: 7070 + targetPort: 7070 + name: edge diff --git a/azure/monolith/tb-node.yml b/azure/monolith/tb-node.yml index 48bce2e6..456a0444 100644 --- a/azure/monolith/tb-node.yml +++ b/azure/monolith/tb-node.yml @@ -65,7 +65,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-node:3.4.1 + image: thingsboard/tb-node:3.5.1 ports: - containerPort: 8080 name: http diff --git a/gcp/microservices/database-setup.yml b/gcp/microservices/database-setup.yml index 2b9df045..92d49457 100644 --- a/gcp/microservices/database-setup.yml +++ b/gcp/microservices/database-setup.yml @@ -34,7 +34,7 @@ spec: containers: - name: tb-db-setup imagePullPolicy: Always - image: thingsboard/tb-node:3.4.1 + image: thingsboard/tb-node:3.5.1 env: - name: TB_SERVICE_ID valueFrom: diff --git a/gcp/microservices/receipts/edge-load-balancer.yml b/gcp/microservices/receipts/edge-load-balancer.yml new file mode 100644 index 00000000..5a47ee97 --- /dev/null +++ b/gcp/microservices/receipts/edge-load-balancer.yml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: Service +metadata: + name: tb-edge-loadbalancer + namespace: thingsboard +spec: + type: LoadBalancer + externalTrafficPolicy: Local + selector: + app: tb-node + ports: + - port: 7070 + targetPort: 7070 + name: edge diff --git a/gcp/microservices/tb-services.yml b/gcp/microservices/tb-services.yml index 8c4c2cea..fd1943e7 100644 --- a/gcp/microservices/tb-services.yml +++ b/gcp/microservices/tb-services.yml @@ -60,7 +60,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-node:3.4.1 + image: thingsboard/tb-node:3.5.1 ports: - containerPort: 8080 name: http @@ -165,7 +165,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-web-ui:3.4.1 + image: thingsboard/tb-web-ui:3.5.1 ports: - containerPort: 8080 name: http @@ -189,6 +189,8 @@ spec: value: "logs" - name: LOGGER_FILENAME value: "tb-web-ui-%DATE%.log" + - name: NODE_OPTIONS + value: "--max-old-space-size=100" - name: DOCKER_MODE value: "true" livenessProbe: @@ -232,7 +234,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-js-executor:3.4.1 + image: thingsboard/tb-js-executor:3.5.1 resources: limits: cpu: "100m" @@ -253,6 +255,8 @@ spec: value: "true" - name: SCRIPT_BODY_TRACE_FREQUENCY value: "1000" + - name: NODE_OPTIONS + value: "--max-old-space-size=200" envFrom: - configMapRef: name: tb-kafka-config diff --git a/gcp/microservices/thirdparty.yml b/gcp/microservices/thirdparty.yml index 1dee61db..2dcce25f 100644 --- a/gcp/microservices/thirdparty.yml +++ b/gcp/microservices/thirdparty.yml @@ -311,7 +311,7 @@ spec: - ReadWriteOnce resources: requests: - storage: 200Mi + storage: 10Gi - metadata: name: app-logs spec: diff --git a/gcp/microservices/transports/tb-coap-transport.yml b/gcp/microservices/transports/tb-coap-transport.yml index 5b141224..ebec1025 100644 --- a/gcp/microservices/transports/tb-coap-transport.yml +++ b/gcp/microservices/transports/tb-coap-transport.yml @@ -90,7 +90,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-coap-transport:3.4.1 + image: thingsboard/tb-coap-transport:3.5.1 ports: - containerPort: 5683 name: coap diff --git a/gcp/microservices/transports/tb-http-transport.yml b/gcp/microservices/transports/tb-http-transport.yml index 1fc5ca73..71a39aba 100644 --- a/gcp/microservices/transports/tb-http-transport.yml +++ b/gcp/microservices/transports/tb-http-transport.yml @@ -90,7 +90,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-http-transport:3.4.1 + image: thingsboard/tb-http-transport:3.5.1 ports: - containerPort: 8080 name: http diff --git a/gcp/microservices/transports/tb-lwm2m-transport.yml b/gcp/microservices/transports/tb-lwm2m-transport.yml index d2066c79..f2a08b39 100644 --- a/gcp/microservices/transports/tb-lwm2m-transport.yml +++ b/gcp/microservices/transports/tb-lwm2m-transport.yml @@ -90,7 +90,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-lwm2m-transport:3.4.1 + image: thingsboard/tb-lwm2m-transport:3.5.1 ports: - containerPort: 5685 name: lwm2m diff --git a/gcp/microservices/transports/tb-mqtt-transport.yml b/gcp/microservices/transports/tb-mqtt-transport.yml index a07307cc..80a7fe25 100644 --- a/gcp/microservices/transports/tb-mqtt-transport.yml +++ b/gcp/microservices/transports/tb-mqtt-transport.yml @@ -97,7 +97,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-mqtt-transport:3.4.1 + image: thingsboard/tb-mqtt-transport:3.5.1 ports: - containerPort: 1883 name: mqtt diff --git a/gcp/microservices/transports/tb-snmp-transport.yml b/gcp/microservices/transports/tb-snmp-transport.yml index ee94dc6a..c7619220 100644 --- a/gcp/microservices/transports/tb-snmp-transport.yml +++ b/gcp/microservices/transports/tb-snmp-transport.yml @@ -90,7 +90,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-snmp-transport:3.4.1 + image: thingsboard/tb-snmp-transport:3.5.1 resources: limits: cpu: "1000m" diff --git a/gcp/monolith/database-setup.yml b/gcp/monolith/database-setup.yml index 2b9df045..92d49457 100644 --- a/gcp/monolith/database-setup.yml +++ b/gcp/monolith/database-setup.yml @@ -34,7 +34,7 @@ spec: containers: - name: tb-db-setup imagePullPolicy: Always - image: thingsboard/tb-node:3.4.1 + image: thingsboard/tb-node:3.5.1 env: - name: TB_SERVICE_ID valueFrom: diff --git a/gcp/monolith/receipts/edge-load-balancer.yml b/gcp/monolith/receipts/edge-load-balancer.yml new file mode 100644 index 00000000..5a47ee97 --- /dev/null +++ b/gcp/monolith/receipts/edge-load-balancer.yml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: Service +metadata: + name: tb-edge-loadbalancer + namespace: thingsboard +spec: + type: LoadBalancer + externalTrafficPolicy: Local + selector: + app: tb-node + ports: + - port: 7070 + targetPort: 7070 + name: edge diff --git a/gcp/monolith/tb-node.yml b/gcp/monolith/tb-node.yml index fe98bb21..9846ee71 100644 --- a/gcp/monolith/tb-node.yml +++ b/gcp/monolith/tb-node.yml @@ -67,7 +67,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-node:3.4.1 + image: thingsboard/tb-node:3.5.1 ports: - containerPort: 8080 name: http diff --git a/helm/thingsboard/templates/js-executor.yaml b/helm/thingsboard/templates/js-executor.yaml index da791970..1441f4cd 100644 --- a/helm/thingsboard/templates/js-executor.yaml +++ b/helm/thingsboard/templates/js-executor.yaml @@ -78,6 +78,8 @@ spec: value: "true" - name: SCRIPT_BODY_TRACE_FREQUENCY value: "1000" + - name: NODE_OPTIONS + value: "--max-old-space-size=200" resources: {{- toYaml .Values.jsexecutor.resources | nindent 12 }} {{- with .Values.jsexecutor.jsexecutorSelector }} diff --git a/helm/thingsboard/templates/node.yaml b/helm/thingsboard/templates/node.yaml index 279dceb6..928fed74 100644 --- a/helm/thingsboard/templates/node.yaml +++ b/helm/thingsboard/templates/node.yaml @@ -96,8 +96,6 @@ spec: value: "{{ .Values.kafka.offsetsTopicReplicationFactor }}" - name: JS_EVALUATOR value: "remote" - - name: TRANSPORT_TYPE - value: "remote" - name: HTTP_LOG_CONTROLLER_ERROR_STACK_TRACE value: "false" - name: CACHE_TYPE diff --git a/helm/thingsboard/templates/web-ui.yaml b/helm/thingsboard/templates/web-ui.yaml index a22022d0..7119f1d7 100644 --- a/helm/thingsboard/templates/web-ui.yaml +++ b/helm/thingsboard/templates/web-ui.yaml @@ -69,6 +69,8 @@ spec: value: "logs" - name: LOGGER_FILENAME value: "tb-web-ui-%DATE%.log" + - name: NODE_OPTIONS + value: "--max-old-space-size=100" - name: DOCKER_MODE value: "true" livenessProbe: diff --git a/kafka/tb-kafka-ui.yml b/kafka/tb-kafka-ui.yml new file mode 100644 index 00000000..1b140011 --- /dev/null +++ b/kafka/tb-kafka-ui.yml @@ -0,0 +1,69 @@ +# +# Copyright © 2016-2021 The Thingsboard Authors +# +# Licensed 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. +# + +###################################################################################################################### +# Kafka manager with web UI to monitor and maintain Kafka's clusters +# see details on https://github.com/yahoo/CMAK +# container on https://hub.docker.com/r/kafkamanager/kafka-manager +# $ kubectl port-forward tb-kafka-ui-0 9000:9000 +# goto weblink: http://localhost:9000 +# First step - add cluster config (will not affect existing cluster, just fetch config from zookeper for a first time) +# Scale up/down if you don't need it +# $ kubectl scale --replicas=0 statefulset/tb-kafka-ui +# Enjoy +###################################################################################################################### + +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: tb-kafka-ui +spec: + replicas: 1 + podManagementPolicy: Parallel + selector: + matchLabels: + app: tb-kafka-ui + template: + metadata: + labels: + app: tb-kafka-ui + spec: + imagePullSecrets: + - name: regcred +# securityContext: +# runAsUser: 100500 +# runAsNonRoot: true +# runAsGroup: 100500 + containers: + - name: server + imagePullPolicy: Always + image: docker.io/kafkamanager/kafka-manager:3.0.0.4 + resources: + requests: + cpu: 500m + memory: 1Gi + limits: + cpu: 500m + memory: 1Gi + ports: + - containerPort: 9000 + name: http9000 + env: + - name: ZK_HOSTS + value: "zookeeper-helm-headless:2181" #place here your zookeeper(s) + - name: JAVA_OPTS + value: "-Xms768m -Xmx768m -Dpidfile.path=/dev/null -Djava.net.preferIPv4Stack=true" + restartPolicy: Always diff --git a/minikube/database-setup.yml b/minikube/database-setup.yml index 2b9df045..92d49457 100644 --- a/minikube/database-setup.yml +++ b/minikube/database-setup.yml @@ -34,7 +34,7 @@ spec: containers: - name: tb-db-setup imagePullPolicy: Always - image: thingsboard/tb-node:3.4.1 + image: thingsboard/tb-node:3.5.1 env: - name: TB_SERVICE_ID valueFrom: diff --git a/minikube/tb-node.yml b/minikube/tb-node.yml index 807a43f1..1fe3c803 100644 --- a/minikube/tb-node.yml +++ b/minikube/tb-node.yml @@ -45,7 +45,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-node:3.4.1 + image: thingsboard/tb-node:3.5.1 ports: - containerPort: 8080 name: http @@ -68,8 +68,6 @@ spec: value: "tb-kafka:9092" - name: JS_EVALUATOR value: "remote" - - name: TRANSPORT_TYPE - value: "remote" - name: HTTP_LOG_CONTROLLER_ERROR_STACK_TRACE value: "false" - name: CACHE_TYPE diff --git a/minikube/thingsboard.yml b/minikube/thingsboard.yml index 8b31a0cf..1031d406 100644 --- a/minikube/thingsboard.yml +++ b/minikube/thingsboard.yml @@ -32,7 +32,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-js-executor:3.4.1 + image: thingsboard/tb-js-executor:3.5.1 resources: limits: cpu: 250m @@ -55,6 +55,8 @@ spec: value: "true" - name: SCRIPT_BODY_TRACE_FREQUENCY value: "1000" + - name: NODE_OPTIONS + value: "--max-old-space-size=200" restartPolicy: Always --- apiVersion: apps/v1 @@ -86,7 +88,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-mqtt-transport:3.4.1 + image: thingsboard/tb-mqtt-transport:3.5.1 ports: - containerPort: 1883 name: mqtt @@ -169,7 +171,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-http-transport:3.4.1 + image: thingsboard/tb-http-transport:3.5.1 ports: - containerPort: 8080 name: http @@ -252,7 +254,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-coap-transport:3.4.1 + image: thingsboard/tb-coap-transport:3.5.1 ports: - containerPort: 5683 name: coap @@ -317,7 +319,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-web-ui:3.4.1 + image: thingsboard/tb-web-ui:3.5.1 ports: - containerPort: 8080 name: http @@ -334,6 +336,8 @@ spec: value: "logs" - name: LOGGER_FILENAME value: "tb-web-ui-%DATE%.log" + - name: NODE_OPTIONS + value: "--max-old-space-size=100" - name: DOCKER_MODE value: "true" livenessProbe: diff --git a/minikube/thirdparty.yml b/minikube/thirdparty.yml index 7366616e..8ff8a642 100644 --- a/minikube/thirdparty.yml +++ b/minikube/thirdparty.yml @@ -294,7 +294,7 @@ spec: - ReadWriteOnce resources: requests: - storage: 200Mi + storage: 10Gi - metadata: name: app-logs spec: diff --git a/openshift/database-setup.yml b/openshift/database-setup.yml index 2b9df045..92d49457 100644 --- a/openshift/database-setup.yml +++ b/openshift/database-setup.yml @@ -34,7 +34,7 @@ spec: containers: - name: tb-db-setup imagePullPolicy: Always - image: thingsboard/tb-node:3.4.1 + image: thingsboard/tb-node:3.5.1 env: - name: TB_SERVICE_ID valueFrom: diff --git a/openshift/tb-node.yml b/openshift/tb-node.yml index 807a43f1..1fe3c803 100644 --- a/openshift/tb-node.yml +++ b/openshift/tb-node.yml @@ -45,7 +45,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-node:3.4.1 + image: thingsboard/tb-node:3.5.1 ports: - containerPort: 8080 name: http @@ -68,8 +68,6 @@ spec: value: "tb-kafka:9092" - name: JS_EVALUATOR value: "remote" - - name: TRANSPORT_TYPE - value: "remote" - name: HTTP_LOG_CONTROLLER_ERROR_STACK_TRACE value: "false" - name: CACHE_TYPE diff --git a/openshift/thingsboard.yml b/openshift/thingsboard.yml index 05a0677d..4a72c788 100644 --- a/openshift/thingsboard.yml +++ b/openshift/thingsboard.yml @@ -32,7 +32,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-js-executor:3.4.1 + image: thingsboard/tb-js-executor:3.5.1 env: - name: REMOTE_JS_EVAL_REQUEST_TOPIC value: "js_eval.requests" @@ -48,6 +48,8 @@ spec: value: "true" - name: SCRIPT_BODY_TRACE_FREQUENCY value: "1000" + - name: NODE_OPTIONS + value: "--max-old-space-size=200" restartPolicy: Always --- apiVersion: apps/v1 @@ -79,7 +81,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-mqtt-transport:3.4.1 + image: thingsboard/tb-mqtt-transport:3.5.1 ports: - containerPort: 1883 name: mqtt @@ -162,7 +164,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-http-transport:3.4.1 + image: thingsboard/tb-http-transport:3.5.1 ports: - containerPort: 8080 name: http @@ -245,7 +247,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-coap-transport:3.4.1 + image: thingsboard/tb-coap-transport:3.5.1 ports: - containerPort: 5683 name: coap @@ -310,7 +312,7 @@ spec: containers: - name: server imagePullPolicy: Always - image: thingsboard/tb-web-ui:3.4.1 + image: thingsboard/tb-web-ui:3.5.1 ports: - containerPort: 8080 name: http @@ -327,6 +329,8 @@ spec: value: "logs" - name: LOGGER_FILENAME value: "tb-web-ui-%DATE%.log" + - name: NODE_OPTIONS + value: "--max-old-space-size=100" - name: DOCKER_MODE value: "true" livenessProbe: diff --git a/openshift/thirdparty.yml b/openshift/thirdparty.yml index b528a8a4..7635b105 100644 --- a/openshift/thirdparty.yml +++ b/openshift/thirdparty.yml @@ -293,7 +293,7 @@ spec: - ReadWriteOnce resources: requests: - storage: 200Mi + storage: 10Gi - metadata: name: app-logs spec: