Merge branch '7.5.x' into 7.6.x

mansisinha · Jan 25, 2024 · 30bed1f · 30bed1f
2 parents 739fb41 + ab5f885
commit 30bed1f
Showing 5 changed files with 27 additions and 3 deletions.
diff --git a/docs/MOLECULE_SCENARIOS.md b/docs/MOLECULE_SCENARIOS.md
@@ -284,6 +284,10 @@ SASL Plain Auth.
 
 Zookeeper, Broker and Kraft Controller co-located while Migration
 
+Kafka broker has custom listener at port 9093
+
+Kraft Controller is running at port 9094
+
 #### Scenario cp-kafka-plain-rhel verify test's the following:
 
 Validates that SASL Plaintext protocol is set.

diff --git a/docs/VARIABLES.md b/docs/VARIABLES.md
@@ -956,6 +956,14 @@ Default:  "{{ config_prefix }}/controller"
 
 ***
 
+### kafka_controller_port
+
+Port to expose Kraft Controller
+
+Default:  9093
+
+***
+
 ### kafka_controller_ssl_enabled
 
 Boolean to configure controller with TLS Encryption. Also manages Java Keystore creation

diff --git a/molecule/cp-kafka-plain-rhel/molecule.yml b/molecule/cp-kafka-plain-rhel/molecule.yml
@@ -2,6 +2,8 @@
 ### Installation of Confluent Community Edition on RHEL8.
 ### SASL Plain Auth.
 ### Zookeeper, Broker and Kraft Controller co-located while Migration
+### Kafka broker has custom listener at port 9093
+### Kraft Controller is running at port 9094
 
 driver:
   name: docker
@@ -129,3 +131,10 @@ provisioner:
         sasl_protocol: plain
 
         confluent_server_enabled: false
+
+        kafka_broker_custom_listeners:
+          client_listener:
+            name: CLIENT
+            port: 9093
+
+        kafka_controller_port: 9094 # Since port 9093 is getting used by client listener
diff --git a/roles/kafka_controller/tasks/health_check.yml b/roles/kafka_controller/tasks/health_check.yml
@@ -2,7 +2,7 @@
 # health check for kafka controller
 - name: Check Kafka Metadata Quorum
   shell: |
-    {{ binary_base_path }}/bin/kafka-metadata-quorum --bootstrap-server {{inventory_hostname}}:9093 \
+    {{ binary_base_path }}/bin/kafka-metadata-quorum --bootstrap-server {{inventory_hostname}}:{{kafka_controller_port}} \
       --command-config {{kafka_controller.client_config_file}} describe --replication
   environment:
     KAFKA_OPTS: "-Xlog:all=error -XX:+IgnoreUnrecognizedVMOptions {% if kerberos_client_config_file_dest != '/etc/krb5.conf' %}-Djava.security.krb5.conf={{kerberos_client_config_file_dest}}{% endif %}"
@@ -13,7 +13,7 @@
 #Registers LEO of controllers only if Metadata Quorum passed in the above task
 - name: Register LogEndOffset
   shell: |
-    {{ binary_base_path }}/bin/kafka-metadata-quorum --bootstrap-server {{inventory_hostname}}:9093 \
+    {{ binary_base_path }}/bin/kafka-metadata-quorum --bootstrap-server {{inventory_hostname}}:{{kafka_controller_port}} \
       --command-config {{kafka_controller.client_config_file}} describe --replication |  grep -v Observer | awk '{print $2}'
   environment:
     KAFKA_OPTS: "-Xlog:all=error -XX:+IgnoreUnrecognizedVMOptions {% if kerberos_client_config_file_dest != '/etc/krb5.conf' %}-Djava.security.krb5.conf={{kerberos_client_config_file_dest}}{% endif %}"

diff --git a/roles/variables/defaults/main.yml b/roles/variables/defaults/main.yml
@@ -431,13 +431,16 @@ kafka_controller_config_prefix: "{{ config_prefix }}/controller"
 kafka_controller_listeners: "{
   'controller': {
     'name': 'CONTROLLER',
-    'port': 9093,
+    'port': {{kafka_controller_port}},
     'ssl_enabled': {{kafka_controller_ssl_enabled|string|lower}},
     'ssl_mutual_auth_enabled': {{kafka_controller_ssl_mutual_auth_enabled|string|lower}},
     'sasl_protocol': '{{kafka_controller_sasl_protocol}}'
   }
 }"
 
+### Port to expose Kraft Controller
+kafka_controller_port: 9093
+
 ### Boolean to configure controller with TLS Encryption. Also manages Java Keystore creation
 kafka_controller_ssl_enabled: "{{ssl_enabled}}"