Skip to content

feat(msk): support Kafka versions 3.9.x and 3.9.x Kraft #34213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 15, 2025
Merged

feat(msk): support Kafka versions 3.9.x and 3.9.x Kraft #34213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1e32df3
feat(msk): support Kafka versions 3.9.x and 3.9.x Kraft
mazyu36 Apr 22, 2025
ea7002e
Merge branch 'main' into feature/kafka-3.9
mazyu36 May 14, 2025
48b0dbf
Merge branch 'main' into feature/kafka-3.9
samson-keung May 14, 2025
0289f2e
Merge branch 'main' into feature/kafka-3.9
mergify[bot] May 14, 2025
9bb5699
Merge branch 'main' into feature/kafka-3.9
samson-keung May 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions packages/@aws-cdk/aws-msk-alpha/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ The following example creates an MSK Cluster.
declare const vpc: ec2.Vpc;
const cluster = new msk.Cluster(this, 'Cluster', {
clusterName: 'myCluster',
kafkaVersion: msk.KafkaVersion.V3_8_X,
kafkaVersion: msk.KafkaVersion.V3_9_X,
vpc,
});
```
Expand All @@ -36,7 +36,7 @@ To control who can access the Cluster, use the `.connections` attribute. For a l
declare const vpc: ec2.Vpc;
const cluster = new msk.Cluster(this, 'Cluster', {
clusterName: 'myCluster',
kafkaVersion: msk.KafkaVersion.V3_8_X,
kafkaVersion: msk.KafkaVersion.V3_9_X,
vpc,
});

Expand Down Expand Up @@ -88,7 +88,7 @@ import * as acmpca from 'aws-cdk-lib/aws-acmpca';
declare const vpc: ec2.Vpc;
const cluster = new msk.Cluster(this, 'Cluster', {
clusterName: 'myCluster',
kafkaVersion: msk.KafkaVersion.V3_8_X,
kafkaVersion: msk.KafkaVersion.V3_9_X,
vpc,
encryptionInTransit: {
clientBroker: msk.ClientBrokerEncryption.TLS,
Expand All @@ -113,7 +113,7 @@ Enable client authentication with [SASL/SCRAM](https://docs.aws.amazon.com/msk/l
declare const vpc: ec2.Vpc;
const cluster = new msk.Cluster(this, 'cluster', {
clusterName: 'myCluster',
kafkaVersion: msk.KafkaVersion.V3_8_X,
kafkaVersion: msk.KafkaVersion.V3_9_X,
vpc,
encryptionInTransit: {
clientBroker: msk.ClientBrokerEncryption.TLS,
Expand All @@ -132,7 +132,7 @@ Enable client authentication with [IAM](https://docs.aws.amazon.com/msk/latest/d
declare const vpc: ec2.Vpc;
const cluster = new msk.Cluster(this, 'cluster', {
clusterName: 'myCluster',
kafkaVersion: msk.KafkaVersion.V3_8_X,
kafkaVersion: msk.KafkaVersion.V3_9_X,
vpc,
encryptionInTransit: {
clientBroker: msk.ClientBrokerEncryption.TLS,
Expand All @@ -155,7 +155,7 @@ import * as acmpca from 'aws-cdk-lib/aws-acmpca';
declare const vpc: ec2.Vpc;
const cluster = new msk.Cluster(this, 'Cluster', {
clusterName: 'myCluster',
kafkaVersion: msk.KafkaVersion.V3_8_X,
kafkaVersion: msk.KafkaVersion.V3_9_X,
vpc,
encryptionInTransit: {
clientBroker: msk.ClientBrokerEncryption.TLS,
Expand Down Expand Up @@ -186,7 +186,7 @@ declare const vpc: ec2.Vpc;
declare const bucket: s3.IBucket;
const cluster = new msk.Cluster(this, 'cluster', {
clusterName: 'myCluster',
kafkaVersion: msk.KafkaVersion.V3_8_X,
kafkaVersion: msk.KafkaVersion.V3_9_X,
vpc,
logging: {
s3: {
Expand Down Expand Up @@ -226,7 +226,7 @@ declare const bucket: s3.IBucket;

const cluster = new msk.Cluster(this, 'cluster', {
clusterName: 'myCluster',
kafkaVersion: msk.KafkaVersion.V3_6_0,
kafkaVersion: msk.KafkaVersion.V3_9_X,
vpc,
storageMode: msk.StorageMode.TIERED,
});
Expand Down
14 changes: 14 additions & 0 deletions packages/@aws-cdk/aws-msk-alpha/lib/cluster-version.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,20 @@ export class KafkaVersion {
* @see https://docs.aws.amazon.com/msk/latest/developerguide/metadata-management.html#kraft-intro
*/
public static readonly V3_8_X_KRAFT = KafkaVersion.of('3.8.x.kraft', { tieredStorage: true });

/**
* Kafka version 3.9.x with ZooKeeper metadata mode support
*
* @see https://docs.aws.amazon.com/msk/latest/developerguide/metadata-management.html#msk-get-connection-string
*/
public static readonly V3_9_X = KafkaVersion.of('3.9.x', { tieredStorage: true });

/**
* Kafka version 3.9.x with KRaft (Apache Kafka Raft) metadata mode support
*
* @see https://docs.aws.amazon.com/msk/latest/developerguide/metadata-management.html#kraft-intro
*/
public static readonly V3_9_X_KRAFT = KafkaVersion.of('3.9.x.kraft', { tieredStorage: true });
/**
* Custom cluster version
* @param version custom version number
Expand Down
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-msk-alpha/test/cluster.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ describe('MSK Cluster', () => {
[msk.KafkaVersion.V3_7_X_KRAFT, '3.7.x.kraft'],
[msk.KafkaVersion.V3_8_X, '3.8.x'],
[msk.KafkaVersion.V3_8_X_KRAFT, '3.8.x.kraft'],
[msk.KafkaVersion.V3_9_X, '3.9.x'],
[msk.KafkaVersion.V3_9_X_KRAFT, '3.9.x.kraft'],
],
)('created with expected Kafka version %j', (parameter, result) => {
new msk.Cluster(stack, 'Cluster', {
Expand Down Expand Up @@ -978,4 +980,3 @@ describe('MSK Cluster', () => {
});
});
});

3 changes: 2 additions & 1 deletion ...ster-version.js.snapshot/KafkaVersionIntegTestDefaultTestDeployAssertD6628743.assets.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions ...dk/aws-msk-alpha/test/integ.cluster-version.js.snapshot/KafkaVersionTestStack.assets.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

138 changes: 138 additions & 0 deletions .../aws-msk-alpha/test/integ.cluster-version.js.snapshot/KafkaVersionTestStack.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1839,6 +1839,144 @@
},
"UpdateReplacePolicy": "Delete",
"DeletionPolicy": "Delete"
},
"ClusterVersion39xSecurityGroupEEB562CB": {
"Type": "AWS::EC2::SecurityGroup",
"Properties": {
"GroupDescription": "MSK security group",
"SecurityGroupEgress": [
{
"CidrIp": "0.0.0.0/0",
"Description": "Allow all outbound traffic by default",
"IpProtocol": "-1"
}
],
"VpcId": {
"Ref": "Vpc8378EB38"
}
}
},
"ClusterVersion39x27DE3BBA": {
"Type": "AWS::MSK::Cluster",
"Properties": {
"BrokerNodeGroupInfo": {
"ClientSubnets": [
{
"Ref": "VpcPrivateSubnet1Subnet536B997A"
},
{
"Ref": "VpcPrivateSubnet2Subnet3788AAA1"
}
],
"InstanceType": "kafka.m5.large",
"SecurityGroups": [
{
"Fn::GetAtt": [
"ClusterVersion39xSecurityGroupEEB562CB",
"GroupId"
]
}
],
"StorageInfo": {
"EBSStorageInfo": {
"VolumeSize": 1000
}
}
},
"ClusterName": "cluster-v3-9-x",
"EncryptionInfo": {
"EncryptionInTransit": {
"ClientBroker": "TLS",
"InCluster": true
}
},
"KafkaVersion": "3.9.x",
"LoggingInfo": {
"BrokerLogs": {
"CloudWatchLogs": {
"Enabled": false
},
"Firehose": {
"Enabled": false
},
"S3": {
"Enabled": false
}
}
},
"NumberOfBrokerNodes": 2
},
"UpdateReplacePolicy": "Delete",
"DeletionPolicy": "Delete"
},
"ClusterVersion39xkraftSecurityGroupA2700FB1": {
"Type": "AWS::EC2::SecurityGroup",
"Properties": {
"GroupDescription": "MSK security group",
"SecurityGroupEgress": [
{
"CidrIp": "0.0.0.0/0",
"Description": "Allow all outbound traffic by default",
"IpProtocol": "-1"
}
],
"VpcId": {
"Ref": "Vpc8378EB38"
}
}
},
"ClusterVersion39xkraft96CD852C": {
"Type": "AWS::MSK::Cluster",
"Properties": {
"BrokerNodeGroupInfo": {
"ClientSubnets": [
{
"Ref": "VpcPrivateSubnet1Subnet536B997A"
},
{
"Ref": "VpcPrivateSubnet2Subnet3788AAA1"
}
],
"InstanceType": "kafka.m5.large",
"SecurityGroups": [
{
"Fn::GetAtt": [
"ClusterVersion39xkraftSecurityGroupA2700FB1",
"GroupId"
]
}
],
"StorageInfo": {
"EBSStorageInfo": {
"VolumeSize": 1000
}
}
},
"ClusterName": "cluster-v3-9-x-kraft",
"EncryptionInfo": {
"EncryptionInTransit": {
"ClientBroker": "TLS",
"InCluster": true
}
},
"KafkaVersion": "3.9.x.kraft",
"LoggingInfo": {
"BrokerLogs": {
"CloudWatchLogs": {
"Enabled": false
},
"Firehose": {
"Enabled": false
},
"S3": {
"Enabled": false
}
}
},
"NumberOfBrokerNodes": 2
},
"UpdateReplacePolicy": "Delete",
"DeletionPolicy": "Delete"
}
},
"Parameters": {
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-version.js.snapshot/cdk.out
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-version.js.snapshot/integ.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

61 changes: 58 additions & 3 deletions packages/@aws-cdk/aws-msk-alpha/test/integ.cluster-version.js.snapshot/manifest.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading