Skip to content

Commit c8862f7

Browse files
authored
Merge pull request #129 from RanabirChakraborty/AMW-428
2 parents d354bfd + 5d2dbf7 commit c8862f7

File tree

6 files changed

+14
-3
lines changed

6 files changed

+14
-3
lines changed

molecule/default/vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ amq_streams_broker_config_files_requires_privilege_escalation: "{{ amq_streams_i
1010
amq_streams_cruise_control_path_to_capacity_file_require_priv_escalation: "{{ amq_streams_install_requires_become | default(true) }}"
1111
amq_streams_cruise_control_logfiles_requires_priv_escalation: "{{ amq_streams_install_requires_become | default(true) }}"
1212
amq_streams_connect_source_file_require_priv_escalation: "{{ amq_streams_install_requires_become | default(true) }}"
13+
amq_streams_common_product_version: 3.9.0

roles/amq_streams_common/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Common tasks for the collection.
66

77
| Variable | Description | Default |
88
|:---------|:------------|:--------|
9-
|`amq_streams_common_product_version` | Kafka version | `3.4.0` |
9+
|`amq_streams_common_product_version` | Kafka version | `4.1.1` |
1010
|`amq_streams_common_scala_version` | Scala version | `2.13` |
1111
|`amq_streams_common_version` | Combination version | `{{ amq_streams_common_scala_version }}-{{ amq_streams_common_product_version }}` |
1212
|`amq_streams_common_archive_file` | Kafka binary package | `kafka_{{ amq_streams_common_version }}.tgz` |

roles/amq_streams_common/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
amq_streams_common_product_version: 3.6.0
2+
amq_streams_common_product_version: 4.1.1
33
amq_streams_common_rhn_product_version: 2.6.0
44
amq_streams_common_rhn_home_dir: "kafka_2.13-{{ amq_streams_common_product_version }}.redhat-00005"
55
amq_streams_common_rhn_product_path: /opt

roles/amq_streams_common/meta/argument_specs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ argument_specs:
22
main:
33
options:
44
amq_streams_common_product_version:
5-
default: 3.4.0
5+
default: 4.1.1
66
description: "Version of Apache Kafka to download and install"
77
type: "str"
88
amq_streams_common_scala_version:

roles/amq_streams_zookeeper/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Zookeeper Role
22

3+
> NOTE: *Starting with Kafka 4.0.0, ZooKeeper support has been removed in favor of KRaft (Kafka Raft Metadata) mode. Consequently, this role includes a version check mechanism. To use this role, ensure you are targeting a Kafka version `<= 3.9.x`. More can be found in [Apache Kafka 4.0.0 Release Announcement](https://kafka.apache.org/blog#apache_kafka_400_release_announcement)*
4+
35
Perform installation and configuration of Zookeeper ensemble.
46

57
This role requires to have a `zookeepers` group (identified by the
@@ -72,3 +74,4 @@ Apache License v2.0 or later
7274
* [Romain Pelisse](https://github.com/rpelisse)
7375
* [Guido Grazioli](https://github.com/guidograzioli)
7476
* [Roman Martin](https://github.com/rmarting)
77+
* [Ranabir Chakraborty](https://github.com/RanabirChakraborty)

roles/amq_streams_zookeeper/tasks/main.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
---
2+
- name: "Validate Kafka version is compatible with Zookeeper (< 4.0.0)"
3+
ansible.builtin.assert:
4+
that:
5+
- amq_streams_common_product_version is version('4.0.0', '<')
6+
fail_msg: "ERROR: You are trying to run Zookeeper with Kafka {{ amq_streams_common_product_version }}. Zookeeper is removed from Kafka 4.0.0 (KRaft mode is required)."
7+
success_msg: "Kafka version {{ amq_streams_common_product_version }} is compatible with Zookeeper."
8+
29
- name: "Ensure user for zookeeper exists (if provided)."
310
ansible.builtin.include_role:
411
name: amq_streams_common

0 commit comments

Comments
 (0)