Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merge upstream/3.5.1 #46

Open
wants to merge 25 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
d41df00
Kafka manager with web UI to monitor and maintain Kafka's clusters
smatvienko-tb Jun 3, 2021
a2fe769
configured max-old-space-size for js-executor
YevhenBondarenko Nov 14, 2022
987e910
typo
YevhenBondarenko Nov 14, 2022
40f8300
added max-old-space-size for web-ui
YevhenBondarenko Nov 18, 2022
8895faa
Version set to 3.4.2
ashvayka Dec 1, 2022
8322f1d
Merge pull request #71 from YevhenBondarenko/feature/js-executor-impr…
ashvayka Dec 1, 2022
79fe7c7
Merge pull request #72 from YevhenBondarenko/feature/max-old-space-size
ashvayka Dec 1, 2022
38d88bd
Version set to 3.4.3
ashvayka Dec 21, 2022
5e773ca
add tb-edge-loadbalancer
pon0marev Dec 30, 2022
c085b33
fix http transport bind port for load-balancer
pon0marev Dec 30, 2022
baedec3
Merge pull request #76 from pon0marev/aws-http-transport
ashvayka Dec 30, 2022
8906596
Delete the TRANSPORT_TYPE variable as unused
pon0marev Jan 3, 2023
614ea7b
Added upgrade launch script
pon0marev Jan 16, 2023
cc014bb
Merge pull request #80 from pon0marev/aws-microservices-upgrade-tb-sc…
ashvayka Jan 16, 2023
9e31b23
Merge pull request #79 from pon0marev/unused-variables
ashvayka Jan 23, 2023
6279574
Release 3.4.4
ashvayka Feb 7, 2023
caa172e
Version set to 3.5.0
ashvayka May 9, 2023
d09b849
Merge pull request #75 from pon0marev/edge-load-balancer
ashvayka May 9, 2023
061cdfc
gcp edge load balancer for monolith
volodymyr-babak May 9, 2023
3ee6b86
Added AWS and Azure Edge load balancer receipts
volodymyr-babak May 9, 2023
3ecb944
Merge pull request #26 from smatvienko-tb/kafka-ui
ashvayka May 10, 2023
42dfb43
Increase Kafka logs volume size to 10Gi
amarkevich Mar 16, 2023
8925ae4
Merge pull request #93 from volodymyr-babak/edge-load-balancer
ashvayka May 16, 2023
7af6464
Version set to 3.5.1
ashvayka May 31, 2023
16e0c90
Merge remote-tracking branch 'upstream/release-3.5.1'
srvaroa Oct 10, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion aws/microservices/database-setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
aatasiei marked this conversation as resolved.
Show resolved Hide resolved
env:
- name: TB_SERVICE_ID
valueFrom:
Expand Down
43 changes: 43 additions & 0 deletions aws/microservices/k8s-upgrade-tb.sh
Original file line number Diff line number Diff line change
@@ -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
23 changes: 23 additions & 0 deletions aws/microservices/receipts/edge-load-balancer.yml
Original file line number Diff line number Diff line change
@@ -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
10 changes: 7 additions & 3 deletions aws/microservices/tb-services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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"
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion aws/microservices/transports/tb-coap-transport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion aws/microservices/transports/tb-http-transport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion aws/microservices/transports/tb-lwm2m-transport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion aws/microservices/transports/tb-mqtt-transport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion aws/microservices/transports/tb-snmp-transport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion aws/monolith/database-setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 4 additions & 3 deletions aws/monolith/receipts/edge-load-balancer.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -19,4 +20,4 @@ spec:
ports:
- port: 7070
targetPort: 7070
name: edge
name: edge
2 changes: 1 addition & 1 deletion aws/monolith/tb-node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion azure/microservices/database-setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
16 changes: 16 additions & 0 deletions azure/microservices/receipts/edge-load-balancer.yml
Original file line number Diff line number Diff line change
@@ -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
10 changes: 7 additions & 3 deletions azure/microservices/tb-services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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"
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion azure/microservices/thirdparty.yml
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ spec:
- ReadWriteOnce
resources:
requests:
storage: 200Mi
storage: 10Gi
- metadata:
name: app-logs
spec:
Expand Down
2 changes: 1 addition & 1 deletion azure/microservices/transports/tb-coap-transport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion azure/microservices/transports/tb-http-transport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion azure/microservices/transports/tb-lwm2m-transport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion azure/microservices/transports/tb-mqtt-transport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion azure/microservices/transports/tb-snmp-transport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion azure/monolith/database-setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
16 changes: 16 additions & 0 deletions azure/monolith/receipts/edge-load-balancer.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion azure/monolith/tb-node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gcp/microservices/database-setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading