From e942a966ff9bdaad77a06d229334401589727460 Mon Sep 17 00:00:00 2001
From: Guillaume Lamirand <guillaume.lamirand@graviteesource.com>
Date: Fri, 22 Mar 2024 10:14:05 +0100
Subject: [PATCH] fix(): revert changes introduced by 1.9.6

---
 cockpit/CHANGELOG.md                          |   5 +
 cockpit/Chart.yaml                            |   6 +-
 cockpit/templates/api/api-configmap.yaml      |  89 ++--
 .../api/api-configmap_gravitee_yaml_test.yaml | 433 ++++--------------
 .../api-configmap_hazelcast_yaml_test.yaml    | 177 ++++++-
 cockpit/tests/api/api-deployment_test.yaml    |   2 +-
 cockpit/values.yaml                           |   8 +
 7 files changed, 325 insertions(+), 395 deletions(-)

diff --git a/cockpit/CHANGELOG.md b/cockpit/CHANGELOG.md
index c4951322..50cecb40 100644
--- a/cockpit/CHANGELOG.md
+++ b/cockpit/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 This file documents all notable changes to [Gravitee.io Cockpit](https://github.com/gravitee-io/helm-charts/tree/master/cockpit) Helm Chart. The release numbering uses [semantic versioning](http://semver.org).
 
+
+### 1.9.7
+
+- [X] Revert changes introduced with 1.9.6
+
 ### 1.9.6
 
 - [X] Add new configuration for controller
diff --git a/cockpit/Chart.yaml b/cockpit/Chart.yaml
index 17cd226d..b9f766fb 100644
--- a/cockpit/Chart.yaml
+++ b/cockpit/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 name: cockpit
 # When the version is modified, make sure the artifacthub.io/changes list is updated
 # Also update CHANGELOG.md
-version: 1.9.6
+version: 1.9.7
 appVersion: 3.16.0
 description: Official Gravitee.io Helm chart for Cockpit
 home: https://gravitee.io
@@ -21,6 +21,4 @@ annotations:
   # List of changes for the release in artifacthub.io
   # https://artifacthub.io/packages/helm/graviteeio/cockpit?modal=changelog
   artifacthub.io/changes: |
-    - Add new configuration for controller
-    - Adapt hazelcast configuration for latest cockpit
-    - Remove compatible-versions values
+    - Revert changes introduced with 1.9.6
diff --git a/cockpit/templates/api/api-configmap.yaml b/cockpit/templates/api/api-configmap.yaml
index aec301ad..3380c16a 100644
--- a/cockpit/templates/api/api-configmap.yaml
+++ b/cockpit/templates/api/api-configmap.yaml
@@ -59,33 +59,7 @@ data:
         uri: mongodb://{{- if (eq .Values.mongo.auth.enabled true) }}{{ .Values.mongo.auth.username }}:{{ .Values.mongo.auth.password }}@{{- end }}{{ .Values.mongo.dbhost }}:{{ .Values.mongo.dbport }}/{{ .Values.mongo.dbname }}?{{- if .Values.mongo.rsEnabled }}&replicaSet={{ .Values.mongo.rs }}{{- end }}{{- if (eq .Values.mongo.auth.enabled true) }}&authSource={{ .Values.mongo.auth.source }}{{- end }}{{- if .Values.mongo.connectTimeoutMS }}&connectTimeoutMS={{ .Values.mongo.connectTimeoutMS }}{{- end }}
         {{- end }}
 
-    cluster:
-      type: hazelcast
-      hazelcast:
-        config-path: ${gravitee.home}/config/hazelcast.xml
-
-    cache:
-      type: hazelcast
-      hazelcast:
-        config-path: ${gravitee.home}/config/hazelcast.xml
-
-    exchange:
-      controller:
-        ws:
-          port: 8062
-          secured: true
-          ssl:
-            clientAuth: REQUIRED
-            keystore:
-              type: ${ssl.keystore.type}
-              path: ${ssl.keystore.path}
-              password: ${ssl.keystore.password}
-            truststore:
-              type: ${truststore.type}
-              path: ${truststore.path}
-              password: ${truststore.password}
-
-    {{ if .Values.generator.enabled -}}
+    {{- if .Values.generator.enabled }}
     swaggerGenerator:
       url: http://{{ template "gravitee.generator.fullname" . }}:{{ .Values.generator.service.externalPort }}
       apiKey: {{ .Values.generator.apiKey }}
@@ -155,6 +129,12 @@ data:
       enabled: false
     {{- end }}
 
+    controller:
+      {{- if .Values.api.controller.compatibleVersions }}
+      compatible-versions:
+{{ toYaml .Values.api.controller.compatibleVersions | indent 8 }}
+      {{- end }}
+
     email:
       enabled: {{ .Values.smtp.enabled }}
       {{- if .Values.smtp.enabled }} 
@@ -284,31 +264,34 @@ data:
 {{ toYaml .Values.authentication.oidc | indent 8 }}
       {{- end }}
 
-  hazelcast.xml: |-
+  hazelcast.xml: |
     <?xml version="1.0" encoding="UTF-8"?>
     <hazelcast xmlns="http://www.hazelcast.com/schema/config"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="http://www.hazelcast.com/schema/config
-               http://www.hazelcast.com/schema/config/hazelcast-config-5.3.xsd">
+               http://www.hazelcast.com/schema/config/hazelcast-config-4.2.xsd">
         <cluster-name>graviteeio-cockpit</cluster-name>
         <properties>
             <property name="hazelcast.discovery.enabled">true</property>
             <property name="hazelcast.max.wait.seconds.before.join">3</property>
             <property name="hazelcast.member.list.publish.interval.seconds">5</property>
             <property name="hazelcast.socket.client.bind.any">false</property>
-            <property name="hazelcast.logging.type">slf4j</property>
         </properties>
 
-        <queue name="exchange-cluster-command-*">
+        <queue name="commands-*">
             <backup-count>0</backup-count>
             <async-backup-count>1</async-backup-count>
         </queue>
 
-        <map name="exchange-controller-primary-channel-candidate">
+        <map name="cockpit.channels.*">
             <backup-count>0</backup-count>
             <async-backup-count>1</async-backup-count>
         </map>
 
+        <reliable-topic name="cockpit.primaryChannels">
+            <read-batch-size>10</read-batch-size>
+        </reliable-topic>
+
         <cp-subsystem>
             <cp-member-count>0</cp-member-count>
         </cp-subsystem>
@@ -325,6 +308,48 @@ data:
         </network>
     </hazelcast>
 
+  hazelcast.yml: |
+    hazelcast:
+      cluster-name: {{ .Release.Name }}_{{ $clusterversion }}
+      network:
+        join:
+          multicast:
+            enabled: false
+          tcp-ip:
+            enabled: false
+          kubernetes:
+            enabled: true
+            namespace: {{ .Release.Namespace }}
+            service-name: {{ template "gravitee.api.fullname" . }}
+
+{{- if .Values.hazelcast.advancedNetwork }}
+      advanced-network:
+        {{- toYaml .Values.hazelcast.advancedNetwork | nindent 8 }}
+{{- end }}
+
+      properties:
+        hazelcast.logging.type: slf4j
+        hazelcast.max.wait.seconds.before.join: 3
+        hazelcast.member.list.publish.interval.seconds: 5
+        hazelcast.socket.client.bind.any: false
+{{- if .Values.hazelcast.properties }}
+        {{- toYaml .Values.hazelcast.properties | nindent 8 }}
+{{- end }}
+
+      cp-subsystem:
+        cp-member-count: 0
+      map:
+        cockpit.channels.*:
+          backup-count: 0
+          async-backup-count: 1
+      queue:
+        commands-*:
+          backup-count: 0
+          async-backup-count: 1
+      reliable-topic:
+        cockpit.primaryChannels:
+          read-batch-size: 10
+
   logback.xml: |
     <?xml version="1.0" encoding="UTF-8"?>
     <!--
diff --git a/cockpit/tests/api/api-configmap_gravitee_yaml_test.yaml b/cockpit/tests/api/api-configmap_gravitee_yaml_test.yaml
index 7093f590..63784a89 100644
--- a/cockpit/tests/api/api-configmap_gravitee_yaml_test.yaml
+++ b/cockpit/tests/api/api-configmap_gravitee_yaml_test.yaml
@@ -60,33 +60,6 @@ tests:
                 sslEnabled: false
                 socketKeepAlive: false
                 uri: mongodb://graviteeio-cockpit-mongodb-replicaset-headless:27017/gravitee?&replicaSet=rs0&connectTimeoutMS=30000
-            
-            cluster:
-              type: hazelcast
-              hazelcast:
-                config-path: ${gravitee.home}/config/hazelcast.xml
-            
-            cache:
-              type: hazelcast
-              hazelcast:
-                config-path: ${gravitee.home}/config/hazelcast.xml
-            
-            exchange:
-              controller:
-                ws:
-                  port: 8062
-                  secured: true
-                  ssl:
-                    clientAuth: REQUIRED
-                    keystore:
-                      type: ${ssl.keystore.type}
-                      path: ${ssl.keystore.path}
-                      password: ${ssl.keystore.password}
-                    truststore:
-                      type: ${truststore.type}
-                      path: ${truststore.path}
-                      password: ${truststore.password}
-            
             swaggerGenerator:
               url: http://my-cockpit-swagger-generator:84
               apiKey: api_key_value
@@ -109,6 +82,12 @@ tests:
             reCaptcha:
               enabled: false
             
+            controller:
+              compatible-versions:
+                am: 3.7.0
+                apim: 3.6.2
+                connector: 1.2.0
+            
             email:
               enabled: true
               host: smtp.example.com
@@ -248,33 +227,6 @@ tests:
                 sslEnabled: false
                 socketKeepAlive: false
                 uri: mongodb://graviteeio-cockpit-mongodb-replicaset-headless:27017/gravitee?&replicaSet=rs0&connectTimeoutMS=30000
-            
-            cluster:
-              type: hazelcast
-              hazelcast:
-                config-path: ${gravitee.home}/config/hazelcast.xml
-            
-            cache:
-              type: hazelcast
-              hazelcast:
-                config-path: ${gravitee.home}/config/hazelcast.xml
-            
-            exchange:
-              controller:
-                ws:
-                  port: 8062
-                  secured: true
-                  ssl:
-                    clientAuth: REQUIRED
-                    keystore:
-                      type: ${ssl.keystore.type}
-                      path: ${ssl.keystore.path}
-                      password: ${ssl.keystore.password}
-                    truststore:
-                      type: ${truststore.type}
-                      path: ${truststore.path}
-                      password: ${truststore.password}
-            
             swaggerGenerator:
               url: http://my-cockpit-swagger-generator:84
               apiKey: api_key_value
@@ -297,6 +249,12 @@ tests:
             reCaptcha:
               enabled: false
             
+            controller:
+              compatible-versions:
+                am: 3.7.0
+                apim: 3.6.2
+                connector: 1.2.0
+            
             email:
               enabled: true
               host: smtp.example.com
@@ -415,33 +373,6 @@ tests:
                 sslEnabled: false
                 socketKeepAlive: false
                 uri: mongodb://graviteeio-cockpit-mongodb-replicaset-headless:27017/gravitee?connectTimeoutMS=30000
-            
-            cluster:
-              type: hazelcast
-              hazelcast:
-                config-path: ${gravitee.home}/config/hazelcast.xml
-            
-            cache:
-              type: hazelcast
-              hazelcast:
-                config-path: ${gravitee.home}/config/hazelcast.xml
-            
-            exchange:
-              controller:
-                ws:
-                  port: 8062
-                  secured: true
-                  ssl:
-                    clientAuth: REQUIRED
-                    keystore:
-                      type: ${ssl.keystore.type}
-                      path: ${ssl.keystore.path}
-                      password: ${ssl.keystore.password}
-                    truststore:
-                      type: ${truststore.type}
-                      path: ${truststore.path}
-                      password: ${truststore.password}
-            
             swaggerGenerator:
               url: http://my-cockpit-swagger-generator:84
               apiKey: api_key_value
@@ -464,6 +395,12 @@ tests:
             reCaptcha:
               enabled: false
             
+            controller:
+              compatible-versions:
+                am: 3.7.0
+                apim: 3.6.2
+                connector: 1.2.0
+            
             email:
               enabled: true
               host: smtp.example.com
@@ -589,33 +526,6 @@ tests:
                 sslEnabled: false
                 socketKeepAlive: false
                 uri: mongodb://graviteeio-cockpit-mongodb-replicaset-headless:27017/gravitee?&replicaSet=rs0&connectTimeoutMS=30000
-            
-            cluster:
-              type: hazelcast
-              hazelcast:
-                config-path: ${gravitee.home}/config/hazelcast.xml
-            
-            cache:
-              type: hazelcast
-              hazelcast:
-                config-path: ${gravitee.home}/config/hazelcast.xml
-            
-            exchange:
-              controller:
-                ws:
-                  port: 8062
-                  secured: true
-                  ssl:
-                    clientAuth: REQUIRED
-                    keystore:
-                      type: ${ssl.keystore.type}
-                      path: ${ssl.keystore.path}
-                      password: ${ssl.keystore.password}
-                    truststore:
-                      type: ${truststore.type}
-                      path: ${truststore.path}
-                      password: ${truststore.password}
-            
             swaggerGenerator:
               url: http://my-cockpit-swagger-generator:84
               apiKey: api_key_value
@@ -638,6 +548,12 @@ tests:
             reCaptcha:
               enabled: false
             
+            controller:
+              compatible-versions:
+                am: 3.7.0
+                apim: 3.6.2
+                connector: 1.2.0
+            
             email:
               enabled: true
               host: smtp.example.com
@@ -757,33 +673,6 @@ tests:
                 sslEnabled: false
                 socketKeepAlive: false
                 uri: mongodb://graviteeio-cockpit-mongodb-replicaset-headless:27017/gravitee?&replicaSet=rs0&connectTimeoutMS=30000
-            
-            cluster:
-              type: hazelcast
-              hazelcast:
-                config-path: ${gravitee.home}/config/hazelcast.xml
-            
-            cache:
-              type: hazelcast
-              hazelcast:
-                config-path: ${gravitee.home}/config/hazelcast.xml
-            
-            exchange:
-              controller:
-                ws:
-                  port: 8062
-                  secured: true
-                  ssl:
-                    clientAuth: REQUIRED
-                    keystore:
-                      type: ${ssl.keystore.type}
-                      path: ${ssl.keystore.path}
-                      password: ${ssl.keystore.password}
-                    truststore:
-                      type: ${truststore.type}
-                      path: ${truststore.path}
-                      password: ${truststore.password}
-            
             swaggerGenerator:
               url: http://my-cockpit-swagger-generator:84
               apiKey: api_key_value
@@ -809,6 +698,12 @@ tests:
             reCaptcha:
               enabled: false
             
+            controller:
+              compatible-versions:
+                am: 3.7.0
+                apim: 3.6.2
+                connector: 1.2.0
+            
             email:
               enabled: true
               host: smtp.example.com
@@ -931,33 +826,6 @@ tests:
                 sslEnabled: false
                 socketKeepAlive: false
                 uri: mongodb://graviteeio-cockpit-mongodb-replicaset-headless:27017/gravitee?&replicaSet=rs0&connectTimeoutMS=30000
-            
-            cluster:
-              type: hazelcast
-              hazelcast:
-                config-path: ${gravitee.home}/config/hazelcast.xml
-            
-            cache:
-              type: hazelcast
-              hazelcast:
-                config-path: ${gravitee.home}/config/hazelcast.xml
-            
-            exchange:
-              controller:
-                ws:
-                  port: 8062
-                  secured: true
-                  ssl:
-                    clientAuth: REQUIRED
-                    keystore:
-                      type: ${ssl.keystore.type}
-                      path: ${ssl.keystore.path}
-                      password: ${ssl.keystore.password}
-                    truststore:
-                      type: ${truststore.type}
-                      path: ${truststore.path}
-                      password: ${truststore.password}
-            
             swaggerGenerator:
               url: http://my-cockpit-swagger-generator:84
               apiKey: api_key_value
@@ -983,8 +851,14 @@ tests:
               secretKey: my_secret_key
               serviceUrl: https://siteverify
               siteKey: my_site_key
-
-
+            
+            
+            controller:
+              compatible-versions:
+                am: 3.7.0
+                apim: 3.6.2
+                connector: 1.2.0
+            
             email:
               enabled: true
               host: smtp.example.com
@@ -1114,33 +988,6 @@ tests:
                 sslEnabled: false
                 socketKeepAlive: false
                 uri: mongodb://graviteeio-cockpit-mongodb-replicaset-headless:27017/gravitee?&replicaSet=rs0&connectTimeoutMS=30000
-            
-            cluster:
-              type: hazelcast
-              hazelcast:
-                config-path: ${gravitee.home}/config/hazelcast.xml
-            
-            cache:
-              type: hazelcast
-              hazelcast:
-                config-path: ${gravitee.home}/config/hazelcast.xml
-            
-            exchange:
-              controller:
-                ws:
-                  port: 8062
-                  secured: true
-                  ssl:
-                    clientAuth: REQUIRED
-                    keystore:
-                      type: ${ssl.keystore.type}
-                      path: ${ssl.keystore.path}
-                      password: ${ssl.keystore.password}
-                    truststore:
-                      type: ${truststore.type}
-                      path: ${truststore.path}
-                      password: ${truststore.password}
-            
             swaggerGenerator:
               url: http://my-cockpit-swagger-generator:84
               apiKey: api_key_value
@@ -1166,6 +1013,12 @@ tests:
             reCaptcha:
               enabled: false
             
+            controller:
+              compatible-versions:
+                am: 3.7.0
+                apim: 3.6.2
+                connector: 1.2.0
+            
             email:
               enabled: true
               host: smtp.example.com
@@ -1310,33 +1163,6 @@ tests:
                 sslEnabled: false
                 socketKeepAlive: false
                 uri: mongodb://graviteeio-cockpit-mongodb-replicaset-headless:27017/gravitee?&replicaSet=rs0&connectTimeoutMS=30000
-            
-            cluster:
-              type: hazelcast
-              hazelcast:
-                config-path: ${gravitee.home}/config/hazelcast.xml
-            
-            cache:
-              type: hazelcast
-              hazelcast:
-                config-path: ${gravitee.home}/config/hazelcast.xml
-            
-            exchange:
-              controller:
-                ws:
-                  port: 8062
-                  secured: true
-                  ssl:
-                    clientAuth: REQUIRED
-                    keystore:
-                      type: ${ssl.keystore.type}
-                      path: ${ssl.keystore.path}
-                      password: ${ssl.keystore.password}
-                    truststore:
-                      type: ${truststore.type}
-                      path: ${truststore.path}
-                      password: ${truststore.password}
-            
             swaggerGenerator:
               url: http://my-cockpit-swagger-generator:84
               apiKey: api_key_value
@@ -1362,6 +1188,12 @@ tests:
             reCaptcha:
               enabled: false
             
+            controller:
+              compatible-versions:
+                am: 3.7.0
+                apim: 3.6.2
+                connector: 1.2.0
+            
             email:
               enabled: true
               host: smtp.example.com
@@ -1506,33 +1338,6 @@ tests:
                 sslEnabled: false
                 socketKeepAlive: false
                 uri: mongodb://graviteeio-cockpit-mongodb-replicaset-headless:27017/gravitee?&replicaSet=rs0&connectTimeoutMS=30000
-            
-            cluster:
-              type: hazelcast
-              hazelcast:
-                config-path: ${gravitee.home}/config/hazelcast.xml
-            
-            cache:
-              type: hazelcast
-              hazelcast:
-                config-path: ${gravitee.home}/config/hazelcast.xml
-            
-            exchange:
-              controller:
-                ws:
-                  port: 8062
-                  secured: true
-                  ssl:
-                    clientAuth: REQUIRED
-                    keystore:
-                      type: ${ssl.keystore.type}
-                      path: ${ssl.keystore.path}
-                      password: ${ssl.keystore.password}
-                    truststore:
-                      type: ${truststore.type}
-                      path: ${truststore.path}
-                      password: ${truststore.password}
-            
             swaggerGenerator:
               url: http://my-cockpit-swagger-generator:84
               apiKey: api_key_value
@@ -1558,6 +1363,12 @@ tests:
             reCaptcha:
               enabled: false
             
+            controller:
+              compatible-versions:
+                am: 3.7.0
+                apim: 3.6.2
+                connector: 1.2.0
+            
             email:
               enabled: true
               host: smtp.example.com
@@ -1690,33 +1501,6 @@ tests:
                 sslEnabled: false
                 socketKeepAlive: false
                 uri: mongodb://graviteeio-cockpit-mongodb-replicaset-headless:27017/gravitee?&replicaSet=rs0&connectTimeoutMS=30000
-            
-            cluster:
-              type: hazelcast
-              hazelcast:
-                config-path: ${gravitee.home}/config/hazelcast.xml
-            
-            cache:
-              type: hazelcast
-              hazelcast:
-                config-path: ${gravitee.home}/config/hazelcast.xml
-            
-            exchange:
-              controller:
-                ws:
-                  port: 8062
-                  secured: true
-                  ssl:
-                    clientAuth: REQUIRED
-                    keystore:
-                      type: ${ssl.keystore.type}
-                      path: ${ssl.keystore.path}
-                      password: ${ssl.keystore.password}
-                    truststore:
-                      type: ${truststore.type}
-                      path: ${truststore.path}
-                      password: ${truststore.password}
-            
             swaggerGenerator:
               url: http://my-cockpit-swagger-generator:84
               apiKey: api_key_value
@@ -1739,6 +1523,12 @@ tests:
             reCaptcha:
               enabled: false
             
+            controller:
+              compatible-versions:
+                am: 3.7.0
+                apim: 3.6.2
+                connector: 1.2.0
+            
             email:
               enabled: true
               host: smtp.example.com
@@ -1866,33 +1656,6 @@ tests:
                 sslEnabled: false
                 socketKeepAlive: false
                 uri: mongodb://graviteeio-cockpit-mongodb-replicaset-headless:27017/gravitee?&replicaSet=rs0&connectTimeoutMS=30000
-            
-            cluster:
-              type: hazelcast
-              hazelcast:
-                config-path: ${gravitee.home}/config/hazelcast.xml
-            
-            cache:
-              type: hazelcast
-              hazelcast:
-                config-path: ${gravitee.home}/config/hazelcast.xml
-            
-            exchange:
-              controller:
-                ws:
-                  port: 8062
-                  secured: true
-                  ssl:
-                    clientAuth: REQUIRED
-                    keystore:
-                      type: ${ssl.keystore.type}
-                      path: ${ssl.keystore.path}
-                      password: ${ssl.keystore.password}
-                    truststore:
-                      type: ${truststore.type}
-                      path: ${truststore.path}
-                      password: ${truststore.password}
-            
             swaggerGenerator:
               url: http://my-cockpit-swagger-generator:84
               apiKey: api_key_value
@@ -1915,6 +1678,12 @@ tests:
             reCaptcha:
               enabled: false
             
+            controller:
+              compatible-versions:
+                am: 3.7.0
+                apim: 3.6.2
+                connector: 1.2.0
+            
             email:
               enabled: true
               host: smtp.example.com
@@ -2046,33 +1815,6 @@ tests:
                 sslEnabled: false
                 socketKeepAlive: false
                 uri: mongodb://graviteeio-cockpit-mongodb-replicaset-headless:27017/gravitee?&replicaSet=rs0&connectTimeoutMS=30000
-            
-            cluster:
-              type: hazelcast
-              hazelcast:
-                config-path: ${gravitee.home}/config/hazelcast.xml
-            
-            cache:
-              type: hazelcast
-              hazelcast:
-                config-path: ${gravitee.home}/config/hazelcast.xml
-            
-            exchange:
-              controller:
-                ws:
-                  port: 8062
-                  secured: true
-                  ssl:
-                    clientAuth: REQUIRED
-                    keystore:
-                      type: ${ssl.keystore.type}
-                      path: ${ssl.keystore.path}
-                      password: ${ssl.keystore.password}
-                    truststore:
-                      type: ${truststore.type}
-                      path: ${truststore.path}
-                      password: ${truststore.password}
-            
             swaggerGenerator:
               url: http://my-cockpit-swagger-generator:84
               apiKey: api_key_value
@@ -2095,6 +1837,12 @@ tests:
             reCaptcha:
               enabled: false
             
+            controller:
+              compatible-versions:
+                am: 3.7.0
+                apim: 3.6.2
+                connector: 1.2.0
+            
             email:
               enabled: true
               host: smtp.example.com
@@ -2221,33 +1969,6 @@ tests:
                 sslEnabled: false
                 socketKeepAlive: false
                 uri: mongodb://graviteeio-cockpit-mongodb-replicaset-headless:27017/gravitee?&replicaSet=rs0&connectTimeoutMS=30000
-            
-            cluster:
-              type: hazelcast
-              hazelcast:
-                config-path: ${gravitee.home}/config/hazelcast.xml
-            
-            cache:
-              type: hazelcast
-              hazelcast:
-                config-path: ${gravitee.home}/config/hazelcast.xml
-            
-            exchange:
-              controller:
-                ws:
-                  port: 8062
-                  secured: true
-                  ssl:
-                    clientAuth: REQUIRED
-                    keystore:
-                      type: ${ssl.keystore.type}
-                      path: ${ssl.keystore.path}
-                      password: ${ssl.keystore.password}
-                    truststore:
-                      type: ${truststore.type}
-                      path: ${truststore.path}
-                      password: ${truststore.password}
-            
             swaggerGenerator:
               url: http://my-cockpit-swagger-generator:84
               apiKey: api_key_value
@@ -2270,6 +1991,12 @@ tests:
             reCaptcha:
               enabled: false
 
+            controller:
+              compatible-versions:
+                am: 3.7.0
+                apim: 3.6.2
+                connector: 1.2.0
+
             email:
               enabled: true
               host: smtp.example.com
diff --git a/cockpit/tests/api/api-configmap_hazelcast_yaml_test.yaml b/cockpit/tests/api/api-configmap_hazelcast_yaml_test.yaml
index 19c2db59..a1f6fb57 100644
--- a/cockpit/tests/api/api-configmap_hazelcast_yaml_test.yaml
+++ b/cockpit/tests/api/api-configmap_hazelcast_yaml_test.yaml
@@ -55,26 +55,29 @@ tests:
             <hazelcast xmlns="http://www.hazelcast.com/schema/config"
                        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                        xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                       http://www.hazelcast.com/schema/config/hazelcast-config-5.3.xsd">
+                       http://www.hazelcast.com/schema/config/hazelcast-config-4.2.xsd">
                 <cluster-name>graviteeio-cockpit</cluster-name>
                 <properties>
                     <property name="hazelcast.discovery.enabled">true</property>
                     <property name="hazelcast.max.wait.seconds.before.join">3</property>
                     <property name="hazelcast.member.list.publish.interval.seconds">5</property>
                     <property name="hazelcast.socket.client.bind.any">false</property>
-                    <property name="hazelcast.logging.type">slf4j</property>
                 </properties>
 
-                <queue name="exchange-cluster-command-*">
+                <queue name="commands-*">
                     <backup-count>0</backup-count>
                     <async-backup-count>1</async-backup-count>
                 </queue>
 
-                <map name="exchange-controller-primary-channel-candidate">
+                <map name="cockpit.channels.*">
                     <backup-count>0</backup-count>
                     <async-backup-count>1</async-backup-count>
                 </map>
 
+                <reliable-topic name="cockpit.primaryChannels">
+                    <read-batch-size>10</read-batch-size>
+                </reliable-topic>
+
                 <cp-subsystem>
                     <cp-member-count>0</cp-member-count>
                 </cp-subsystem>
@@ -89,4 +92,168 @@ tests:
                         </kubernetes>
                     </join>
                 </network>
-            </hazelcast>
\ No newline at end of file
+            </hazelcast>
+
+  - it: should apply default hazelcast.yml configuration on the 1st revision
+    template: api/api-configmap.yaml
+    release:
+      name: my-cockpit
+      namespace: unittest
+      revision: 1
+    chart:
+      version: 1.0.0-chart
+      appVersion: 1.0.0-app
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: data.[hazelcast.yml]
+          value: |
+            hazelcast:
+              cluster-name: my-cockpit_52359412
+              network:
+                join:
+                  multicast:
+                    enabled: false
+                  tcp-ip:
+                    enabled: false
+                  kubernetes:
+                    enabled: true
+                    namespace: unittest
+                    service-name: my-cockpit-api
+
+              properties:
+                hazelcast.logging.type: slf4j
+                hazelcast.max.wait.seconds.before.join: 3
+                hazelcast.member.list.publish.interval.seconds: 5
+                hazelcast.socket.client.bind.any: false
+
+              cp-subsystem:
+                cp-member-count: 0
+              map:
+                cockpit.channels.*:
+                  backup-count: 0
+                  async-backup-count: 1
+              queue:
+                commands-*:
+                  backup-count: 0
+                  async-backup-count: 1
+              reliable-topic:
+                cockpit.primaryChannels:
+                  read-batch-size: 10
+
+  - it: should apply default hazelcast.yml configuration on a 2nd revision
+    template: api/api-configmap.yaml
+    release:
+      name: my-cockpit
+      namespace: unittest
+      revision: 2
+    chart:
+      version: 1.0.0-chart
+      appVersion: 1.0.0-app
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: data.[hazelcast.yml]
+          value: |
+            hazelcast:
+              cluster-name: my-cockpit_2
+              network:
+                join:
+                  multicast:
+                    enabled: false
+                  tcp-ip:
+                    enabled: false
+                  kubernetes:
+                    enabled: true
+                    namespace: unittest
+                    service-name: my-cockpit-api
+
+              properties:
+                hazelcast.logging.type: slf4j
+                hazelcast.max.wait.seconds.before.join: 3
+                hazelcast.member.list.publish.interval.seconds: 5
+                hazelcast.socket.client.bind.any: false
+
+              cp-subsystem:
+                cp-member-count: 0
+              map:
+                cockpit.channels.*:
+                  backup-count: 0
+                  async-backup-count: 1
+              queue:
+                commands-*:
+                  backup-count: 0
+                  async-backup-count: 1
+              reliable-topic:
+                cockpit.primaryChannels:
+                  read-batch-size: 10
+
+  - it: should apply additional properties in hazelcast.yml configuration
+    template: api/api-configmap.yaml
+    set:
+      hazelcast:
+        properties:
+          hazelcast.diagnostics.enabled: true
+        advancedNetwork:
+          enabled: true
+          rest-server-socket-endpoint-config:
+            endpoint-groups:
+              CLUSTER_READ:
+                enabled: true
+              HEALTH_CHECK:
+                enabled: true
+    release:
+      name: my-cockpit
+      namespace: unittest
+    chart:
+      version: 1.0.0-chart
+      appVersion: 1.0.0-app
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: data.[hazelcast.yml]
+          value: |
+            hazelcast:
+              cluster-name: my-cockpit_0
+              network:
+                join:
+                  multicast:
+                    enabled: false
+                  tcp-ip:
+                    enabled: false
+                  kubernetes:
+                    enabled: true
+                    namespace: unittest
+                    service-name: my-cockpit-api
+              advanced-network:
+                enabled: true
+                rest-server-socket-endpoint-config:
+                  endpoint-groups:
+                    CLUSTER_READ:
+                      enabled: true
+                    HEALTH_CHECK:
+                      enabled: true
+
+              properties:
+                hazelcast.logging.type: slf4j
+                hazelcast.max.wait.seconds.before.join: 3
+                hazelcast.member.list.publish.interval.seconds: 5
+                hazelcast.socket.client.bind.any: false
+                hazelcast.diagnostics.enabled: true
+
+              cp-subsystem:
+                cp-member-count: 0
+              map:
+                cockpit.channels.*:
+                  backup-count: 0
+                  async-backup-count: 1
+              queue:
+                commands-*:
+                  backup-count: 0
+                  async-backup-count: 1
+              reliable-topic:
+                cockpit.primaryChannels:
+                  read-batch-size: 10
diff --git a/cockpit/tests/api/api-deployment_test.yaml b/cockpit/tests/api/api-deployment_test.yaml
index 786dd88b..05778c37 100644
--- a/cockpit/tests/api/api-deployment_test.yaml
+++ b/cockpit/tests/api/api-deployment_test.yaml
@@ -71,7 +71,7 @@ tests:
           value:
             annotations:
               chaos.alpha.kubernetes.io/enabled: "false"
-              checksum/config: 66720a55c0a46f60e4d7f7523a2673d931f895ae222fcadf80a75a18654fbe37
+              checksum/config: 02e31a22a8941c4836da71a7bc5f06aaad10f5bebf708a6774aa8170138b8c1d
             labels:
               app.kubernetes.io/component: api
               app.kubernetes.io/instance: my-cockpit
diff --git a/cockpit/values.yaml b/cockpit/values.yaml
index 630c776a..12c5dffc 100644
--- a/cockpit/values.yaml
+++ b/cockpit/values.yaml
@@ -143,6 +143,10 @@ mongodb-replicaset:
       - ReadWriteOnce
     size: 1Gi
 
+hazelcast: {}
+#  advancedNetwork: {}
+#  properties: {}
+
 api:
   enabled: true
   upgrader: false
@@ -316,6 +320,10 @@ api:
 #        uri: https://great-cluster.westeurope.azure.confluent.cloud/kafka/v3/clusters/id-cluster/topics
 
   controller:
+    compatibleVersions:
+      apim: "3.6.2"
+      am: "3.7.0"
+      connector: "1.2.0"
     ws:
       enabled: true
       port: 8062