From e4068744b96235ffc23586bb167dfbad926c4492 Mon Sep 17 00:00:00 2001 From: shblue21 Date: Fri, 15 Sep 2023 13:28:50 +0900 Subject: [PATCH 1/4] feat: add larger instance types for MSK cluster This commit adds support for larger instance types (kafka.m5.8xlarge, kafka.m5.12xlarge, kafka.m5.16xlarge, kafka.m5.24xlarge) to the MSK cluster module. Now users can choose from a wider range of instance sizes when creating an MSK cluster. --- plugins/modules/msk_cluster.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/plugins/modules/msk_cluster.py b/plugins/modules/msk_cluster.py index aa0383294b2..0d40b78da1d 100644 --- a/plugins/modules/msk_cluster.py +++ b/plugins/modules/msk_cluster.py @@ -54,6 +54,10 @@ - kafka.m5.xlarge - kafka.m5.2xlarge - kafka.m5.4xlarge + - kafka.m5.8xlarge + - kafka.m5.12xlarge + - kafka.m5.16xlarge + - kafka.m5.24xlarge default: kafka.t3.small type: str ebs_volume_size: @@ -662,6 +666,10 @@ def main(): "kafka.m5.xlarge", "kafka.m5.2xlarge", "kafka.m5.4xlarge", + "kafka.m5.8xlarge", + "kafka.m5.12xlarge", + "kafka.m5.16xlarge", + "kafka.m5.24xlarge", ], default="kafka.t3.small", ), From 73acfaf1bcccc1eca2c78d31dc9994e617e9d3b6 Mon Sep 17 00:00:00 2001 From: shblue21 Date: Thu, 11 Jan 2024 21:42:11 +0900 Subject: [PATCH 2/4] feat: Add support for m7g types in MSK cluster creation --- plugins/modules/msk_cluster.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/plugins/modules/msk_cluster.py b/plugins/modules/msk_cluster.py index 0d40b78da1d..9ecf053f87f 100644 --- a/plugins/modules/msk_cluster.py +++ b/plugins/modules/msk_cluster.py @@ -58,6 +58,13 @@ - kafka.m5.12xlarge - kafka.m5.16xlarge - kafka.m5.24xlarge + - kafka.m7g.large + - kafka.m7g.xlarge + - kafka.m7g.2xlarge + - kafka.m7g.4xlarge + - kafka.m7g.8xlarge + - kafka.m7g.12xlarge + - kafka.m7g.16xlarge default: kafka.t3.small type: str ebs_volume_size: @@ -670,6 +677,13 @@ def main(): "kafka.m5.12xlarge", "kafka.m5.16xlarge", "kafka.m5.24xlarge", + "kafka.m7g.large", + "kafka.m7g.xlarge", + "kafka.m7g.2xlarge", + "kafka.m7g.4xlarge", + "kafka.m7g.8xlarge", + "kafka.m7g.12xlarge", + "kafka.m7g.16xlarge", ], default="kafka.t3.small", ), From ae6fe447c18a3ace839af94ab5d0c04fcedc7466 Mon Sep 17 00:00:00 2001 From: shblue21 Date: Thu, 11 Jan 2024 22:09:26 +0900 Subject: [PATCH 3/4] add change log fragment --- changelogs/fragments/1947-add_support_msk_addtinal_type.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 changelogs/fragments/1947-add_support_msk_addtinal_type.yml diff --git a/changelogs/fragments/1947-add_support_msk_addtinal_type.yml b/changelogs/fragments/1947-add_support_msk_addtinal_type.yml new file mode 100644 index 00000000000..fd9bb55071f --- /dev/null +++ b/changelogs/fragments/1947-add_support_msk_addtinal_type.yml @@ -0,0 +1,4 @@ +minor_changes: +- msk_cluster - Support for additional types of MSK clusters `m5` and `m7g`. + C(kafka.m5.8xlarge), C(kafka.m5.12xlarge), C(kafka.m5.16xlarge), C(kafka.m5.24xlarge), + C(kafka.m7g.large), C(kafka.m7g.xlarge), C(kafka.m7g.2xlarge), C(kafka.m7g.4xlarge), C(kafka.m7g.8xlarge), C(kafka.m7g.12xlarge), and C(kafka.m7g.16xlarge) \ No newline at end of file From 01fdd400fcf0478436dd05108842fc0389de31f2 Mon Sep 17 00:00:00 2001 From: Mark Chappell Date: Thu, 11 Jan 2024 14:18:41 +0100 Subject: [PATCH 4/4] Update changelogs/fragments/1947-add_support_msk_addtinal_type.yml --- changelogs/fragments/1947-add_support_msk_addtinal_type.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/changelogs/fragments/1947-add_support_msk_addtinal_type.yml b/changelogs/fragments/1947-add_support_msk_addtinal_type.yml index fd9bb55071f..4c55f7b78f6 100644 --- a/changelogs/fragments/1947-add_support_msk_addtinal_type.yml +++ b/changelogs/fragments/1947-add_support_msk_addtinal_type.yml @@ -1,4 +1,2 @@ minor_changes: -- msk_cluster - Support for additional types of MSK clusters `m5` and `m7g`. - C(kafka.m5.8xlarge), C(kafka.m5.12xlarge), C(kafka.m5.16xlarge), C(kafka.m5.24xlarge), - C(kafka.m7g.large), C(kafka.m7g.xlarge), C(kafka.m7g.2xlarge), C(kafka.m7g.4xlarge), C(kafka.m7g.8xlarge), C(kafka.m7g.12xlarge), and C(kafka.m7g.16xlarge) \ No newline at end of file +- msk_cluster - Support for additional ``m5`` and ``m7g`` types of MSK clusters (https://github.com/ansible-collections/community.aws/pull/1947). \ No newline at end of file