Dbeaver devops#2304 release te 25 3 0

AWS/ecs-fargate/README.md

@@ -44,7 +44,7 @@ git clone https://github.com/dbeaver/team-edition-deploy.git
    ![Region](images/region.png)
 
    - Ensure that the `alb_certificate_Identifier` variable contains the ID from [AWS Certificate Manager](#importing-an-ssl-certificate-in-aws) corresponding to the domain name specified   in the `CLOUDBEAVER_PUBLIC_URL` variable within `variables.tf`. The domain name in `CLOUDBEAVER_PUBLIC_URL` must match the domain for which the certificates have been issued.
-   - You can customize the deployment version by updating the `dbeaver_te_version` environment variable. The default version is `25.2.0`.
+   - You can customize the deployment version by updating the `dbeaver_te_version` environment variable.
 
 7. Run `terraform init` and then `terraform apply` in `ecs-fargate` directory to create the ECS cluster and complete the deployment.
 

AWS/ecs-fargate/main.tf

@@ -21,6 +21,7 @@ locals {
         item.name == "CLOUDBEAVER_QM_SERVER_URL" ? format("http://%s-cloudbeaver-qm:8972/qm", var.deployment_id) :
         item.name == "CLOUDBEAVER_RM_SERVER_URL" ? format("http://%s-cloudbeaver-rm:8971/rm", var.deployment_id) :
         item.name == "CLOUDBEAVER_TM_SERVER_URL" ? format("http://%s-cloudbeaver-tm:8973/tm", var.deployment_id) :
+        item.name == "CLOUDBEAVER_KAFKA_BROKERS" ? format("http://%s-kafka:9092", var.deployment_id) :
         item.value
       )
     }

AWS/ecs-fargate/variables.tf.example

@@ -13,7 +13,7 @@ variable "aws_region" {
 variable "dbeaver_te_version" {
   description = "The version of the cluster you want to deploy"
   type = string
-  default = "25.2.0"
+  default = "25.3.0"
 }
 
 variable "alb_certificate_Identifier" {
@@ -97,30 +97,7 @@ variable "private_subnet_cidrs" {
 
 variable "cloudbeaver-kafka-env" {
   # type = map(string)
-  default = [
-    { "name" : "KAFKA_CFG_NODE_ID",
-    "value" : "0" },
-    { "name" : "KAFKA_BROKER_ID",
-    "value" : "0" },
-    { "name" : "KAFKA_ENABLE_KRAFT",
-    "value" : "yes" },
-    { "name" : "ALLOW_PLAINTEXT_LISTENER",
-    "value" : "yes" },
-    { "name" : "KAFKA_CFG_PROCESS_ROLES",
-    "value" : "controller,broker" },
-    { "name" : "KAFKA_CFG_CONTROLLER_QUORUM_VOTERS",
-    "value" : "0@127.0.0.1:9093" },
-    { "name" : "KAFKA_CFG_LISTENERS",
-    "value" : "PLAINTEXT://:9092,CONTROLLER://:9093" },
-    { "name" : "KAFKA_CFG_ADVERTISED_LISTENERS",
-    "value" : "PLAINTEXT://:9092" },
-    { "name" : "KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP",
-    "value" : "CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT" },
-    { "name" : "KAFKA_CFG_CONTROLLER_LISTENER_NAMES",
-    "value" : "CONTROLLER" },
-    { "name" : "KAFKA_CFG_INTER_BROKER_LISTENER_NAME",
-    "value" : "PLAINTEXT" }
-    ]
+  default = []
 }
 
 
@@ -193,6 +170,10 @@ variable "cloudbeaver-dc-env" {
   {
       "name": "CLOUDBEAVER_PUBLIC_URL",
       "value": "https://cloudbeaver.io"
+  },
+  {
+      "name": "CLOUDBEAVER_KAFKA_BROKERS",
+      "value": "kafka:9092"
   }]
 }
 

README.md

@@ -1,6 +1,6 @@
 ## DBeaver Team Edition
 
-#### Version 25.2
+#### Version 25.3.0
 
 DBeaver Team Edition is a client-server application.  
 It requires server deployment. You can deploy it on a single host (e.g. your local computer)
@@ -38,7 +38,7 @@ DBeaver Team Edition works in conjunction with a desktop client application. Aft
 - **Web interface** – accessible directly through your browser
 - **Desktop client** – provides enhanced features and better performance
 
-Download the desktop client for your platform: [**DBeaver Team Edition Desktop**](https://dbeaver.com/downloads-team/25.2.0/)
+Download the desktop client for your platform: [**DBeaver Team Edition Desktop**](https://dbeaver.com/downloads-team/25.3.0/)
 
 ### Server version update  
 Version update is handled differently for different deployment methods. To update the Team Edition version, follow these instructions:  
@@ -60,6 +60,7 @@ To change an internal PostgreSQL password use [this instruction](CHANGEPWD.md#ho
 - [Early access](https://github.com/dbeaver/team-edition-deploy/tree/devel)
 
 ### Older versions:
+- [25.2.0](https://github.com/dbeaver/team-edition-deploy/tree/25.2.0)
 - [25.1.0](https://github.com/dbeaver/team-edition-deploy/tree/25.1.0)
 - [25.0.0](https://github.com/dbeaver/team-edition-deploy/tree/25.0.0)
 - [24.3.0](https://github.com/dbeaver/team-edition-deploy/tree/24.3.0)

compose/README.md

@@ -187,11 +187,31 @@ For detailed instructions on how to use the script manager, refer to [manager do
 
 ## Version update procedure
 
+### Standard update procedure (recommended)
+
+1. Navigate to `team-edition-deploy/compose/cbte`
+2. Stop the cluster: `docker-compose down` or `docker compose down`
+3. Update your deployment files:
+   - Fetch latest changes: `git fetch`
+   - Switch to new release version: `git checkout <version-tag>` (e.g., `git checkout 25.2.0`)
+   - Change value of `CLOUDBEAVER_VERSION_TAG` in `.env` with a preferred version (skip if tag `latest` is set)
+4. Pull new docker images: `docker-compose pull` or `docker compose pull`
+5. Start the cluster: `docker-compose up -d` or `docker compose up -d`
+
+### Alternative update procedure (for simple updates)
+
+If you are not updating across major version boundaries and don't need configuration changes:
+
 1. Navigate to `team-edition-deploy/compose/cbte`
 2. Change value of `CLOUDBEAVER_VERSION_TAG` in `.env` with a preferred version. Go to next step if tag `latest` is set.
 3. Pull new docker images: `docker-compose pull` or `docker compose pull`  
 4. Restart cluster: `docker-compose up -d` or `docker compose up -d`
 
+**Note:** The standard procedure using `docker-compose down` is recommended because it ensures clean container replacement, especially when service names or configurations change between versions.
+
+### Version update to 25.1.0 or later
+
+Starting from version 25.1.0, the proxy container name has changed from `nginx` to `web-proxy`. When updating to version 25.1.0 or later, you **must** use the [standard update procedure](#standard-update-procedure-recommended) with `docker-compose down` to ensure the old container is properly removed.
 
 ### Version update from 24.0.0 or earlier
 

compose/cbte/.env.example

@@ -1,6 +1,6 @@
 # CloudBeaver TE server version. Based on DockerHub images tag
 # 
-CLOUDBEAVER_VERSION_TAG=25.2.0
+CLOUDBEAVER_VERSION_TAG=25.3.0
 IMAGE_SOURCE=dbeaver
 PODMAN_IMAGE_SOURCE=docker.io/dbeaver
 # Domain name of cluster endpoint. eg. dbeaver-te.example.com 

compose/cbte/docker-compose-nethost.yml

@@ -35,14 +35,9 @@ services:
     image: ${IMAGE_SOURCE:-dbeaver}/cloudbeaver-kafka:3.9
     network_mode: host
     environment:
-      - KAFKA_CFG_NODE_ID=0
-      - KAFKA_CFG_PROCESS_ROLES=controller,broker
       - KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@127.0.0.1:9093
       - KAFKA_CFG_LISTENERS=PLAINTEXT://127.0.0.1:9092,CONTROLLER://127.0.0.1:9093
       - KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://127.0.0.1:9092
-      - KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT
-      - KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER
-      - KAFKA_CFG_INTER_BROKER_LISTENER_NAME=PLAINTEXT
 
   postgres:
     restart: unless-stopped

compose/cbte/docker-compose.yml

@@ -38,15 +38,6 @@ services:
     hostname: kafka
     expose:
       - 9092
-    environment:
-      - KAFKA_CFG_NODE_ID=0
-      - KAFKA_CFG_PROCESS_ROLES=controller,broker
-      - KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@kafka:9093
-      - KAFKA_CFG_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093
-      - KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://:9092
-      - KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT
-      - KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER
-      - KAFKA_CFG_INTER_BROKER_LISTENER_NAME=PLAINTEXT
     networks:
       - cloudbeaver-te-private-net
   postgres:

compose/cbte/podman-compose.yml

@@ -43,15 +43,6 @@ services:
     hostname: kafka
     expose:
       - 9092
-    environment:
-      - KAFKA_CFG_NODE_ID=0
-      - KAFKA_CFG_PROCESS_ROLES=controller,broker
-      - KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@kafka:9093
-      - KAFKA_CFG_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093
-      - KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://:9092
-      - KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT
-      - KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER
-      - KAFKA_CFG_INTER_BROKER_LISTENER_NAME=PLAINTEXT
     networks:
       - cloudbeaver-te-private-net
   postgres:

k8s/cbte/Chart.yaml

@@ -3,4 +3,4 @@ name: cbte
 description: A Helm chart for CloudBeaver TE application
 type: application
 version: 0.0.1
-appVersion: 25.2.0
+appVersion: 25.3.0

k8s/cbte/templates/deployment/db.yaml

@@ -19,7 +19,7 @@ spec:
         app: db
     spec:
       containers:
-        - image: dbeaver/cloudbeaver-postgres:13
+        - image: "{{ .Values.postgres.image | default "dbeaver/cloudbeaver-postgres:13" }}"
           imagePullPolicy: "IfNotPresent"
           name: postgres
           env:

k8s/cbte/templates/deployment/kafka.yaml

@@ -17,32 +17,10 @@ spec:
         {{ .Release.Name }}-net: "true"
         app: kafka
     spec:
-      securityContext:
-        runAsUser: 1001
-        fsGroup: 1001
       containers:
-        - image: dbeaver/cloudbeaver-kafka:3.9
+        - image:  "{{ .Values.kafka.image | default "dbeaver/cloudbeaver-kafka:3.9" }}"
           imagePullPolicy: "IfNotPresent"
           name: kafka
-          env:
-            # KRaft settings
-            - name: KAFKA_CFG_NODE_ID
-              value: "0"
-            - name: KAFKA_CFG_PROCESS_ROLES
-              value: "controller,broker"
-            - name: KAFKA_CFG_CONTROLLER_QUORUM_VOTERS
-              value: "0@kafka:9093"
-            # Listeners
-            - name: KAFKA_CFG_LISTENERS
-              value: "PLAINTEXT://:9092,CONTROLLER://:9093"
-            - name: KAFKA_CFG_ADVERTISED_LISTENERS
-              value: "PLAINTEXT://:9092"
-            - name: KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP
-              value: "CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT"
-            - name: KAFKA_CFG_CONTROLLER_LISTENER_NAMES
-              value: "CONTROLLER"
-            - name: KAFKA_CFG_INTER_BROKER_LISTENER_NAME
-              value: "PLAINTEXT"
           ports:
             - containerPort: 9092
           resources: {}

k8s/cbte/values.yaml.example

@@ -4,7 +4,7 @@
 
 # cloudbeaver general values for all TE services
 cloudbeaver:
-  imageTag: "25.2.0"
+  imageTag: "25.3.0"
   pullPolicy: Always
   # pullCredsName - name of a secret config map that contains docker repo auths
   # pullCredsName: regcred
@@ -44,6 +44,10 @@ cloudbeaverQM:
 cloudbeaverTM:
   replicaCount: 1
   image: dbeaver/cloudbeaver-tm  
+kafka:
+  image: "dbeaver/cloudbeaver-kafka:3.9"
+postgres:
+  image: "dbeaver/cloudbeaver-postgres:13"
 
 # Cloud storage configuration 
 # By default is None, it means not cloud deployment