Skip to content

chore(java/eks): refresh sample code and set Amazon EKS version as 1.32 #1182

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 2 commits into from
May 30, 2025
Merged

chore(java/eks): refresh sample code and set Amazon EKS version as 1.32 #1182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b4daeb
chore(java/eks): refresh sample code and set Amazon EKS version as 1.32
guessi May 26, 2025
78672fe
chore(java/eks): fix typo
guessi May 28, 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
6 changes: 3 additions & 3 deletions java/eks/fargate-cluster/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<cdk.version>2.175.1</cdk.version>
<kubectl.version>2.0.0</kubectl.version>
<cdk.version>2.198.0</cdk.version>
<kubectl.version>2.1.0</kubectl.version>
<constructs.version>[10.0.0,11.0.0)</constructs.version>
<junit.version>5.7.1</junit.version>
</properties>
Expand All @@ -25,7 +25,7 @@

<dependency>
<groupId>software.amazon.awscdk</groupId>
<artifactId>cdk-lambda-layer-kubectl-v31</artifactId>
<artifactId>cdk-lambda-layer-kubectl-v32</artifactId>
<version>${kubectl.version}</version>
</dependency>

Expand Down
8 changes: 4 additions & 4 deletions java/eks/fargate-cluster/src/main/java/com/amazonaws/cdk/EksFargateStack.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import software.amazon.awscdk.CfnOutput;
import software.amazon.awscdk.Stack;
import software.amazon.awscdk.cdk.lambdalayer.kubectl.v31.KubectlV31Layer;
import software.amazon.awscdk.cdk.lambdalayer.kubectl.v32.KubectlV32Layer;
import software.amazon.awscdk.services.ec2.SubnetSelection;
import software.amazon.awscdk.services.ec2.SubnetType;
import software.amazon.awscdk.services.eks.*;
Expand Down Expand Up @@ -43,9 +43,9 @@ public EksFargateStack(final Construct scope, final String id, final EksFargateP
.mastersRole(clusterAdminRole)
.role(clusterAdminRole)
.endpointAccess(EndpointAccess.PUBLIC)
.version(KubernetesVersion.V1_31)
.version(KubernetesVersion.V1_32)
.vpc(props.getVpc())
.kubectlLayer(new KubectlV31Layer(this, "KubectlLayer"))
.kubectlLayer(new KubectlV32Layer(this, "KubectlLayer"))
.vpcSubnets(List.of(SubnetSelection.builder()
.subnetType(SubnetType.PRIVATE_WITH_EGRESS)
.build()))
Expand All @@ -72,7 +72,7 @@ public EksFargateStack(final Construct scope, final String id, final EksFargateP
new CfnAddon(this, "eks-kube-proxy-addon", CfnAddonProps.builder()
.clusterName(eksCluster.getClusterName())
.addonName("kube-proxy")
.addonVersion("v1.31.3-eksbuild.2")
.addonVersion("v1.32.3-eksbuild.7")
.resolveConflicts("OVERWRITE")
.build());

Expand Down
2 changes: 1 addition & 1 deletion java/eks/fargate-cluster/src/test/java/com/amazonaws/cdk/EksFargateStackTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ void testEksCluster() {
Map.of(
"Config", Map.of(
"name", "SampleCluster",
"version", "1.31"
"version", "1.32"
)
)
), 1);
Expand Down
4 changes: 2 additions & 2 deletions java/eks/fargate-cluster/src/test/resources/com/amazonaws/cdk/EksFargateStackExpected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@
},
"Config": {
"name": "SampleCluster",
"version": "1.31",
"version": "1.32",
"roleArn": {
"Fn::GetAtt": [
"EksClusterAdminRoleD3CAEBD0",
Expand Down Expand Up @@ -765,7 +765,7 @@
"Type": "AWS::EKS::Addon",
"Properties": {
"AddonName": "kube-proxy",
"AddonVersion": "v1.31.3-eksbuild.2",
"AddonVersion": "v1.32.3-eksbuild.7",
"ClusterName": {
"Ref": "EksFargateCluster07FC3D2B"
},
Expand Down
8 changes: 4 additions & 4 deletions java/eks/private-cluster/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,10 @@ For other packages or tools like `kubectl`, create an S3 bucket accessible from
Sample cloudshell session:

```
[cloudshell-user@ip-10-2-84-204 ~]$ curl -O https://s3.us-west-2.amazonaws.com/amazon-eks/1.31.4/2025-01-10/bin/darwin/amd64/kubectl
[cloudshell-user@ip-10-2-84-204 ~]$ curl -O https://s3.us-west-2.amazonaws.com/amazon-eks/1.32.4/2025-04-17/bin/darwin/amd64/kubectl

[cloudshell-user@ip-10-2-84-204 ~]$ aws s3 cp kubectl s3://my-bucket/kubectl-1.31.4
upload: ./kubectl to s3://my-bucket/kubectl-1.31.4
[cloudshell-user@ip-10-2-84-204 ~]$ aws s3 cp kubectl s3://my-bucket/kubectl-1.32.4
upload: ./kubectl to s3://my-bucket/kubectl-1.32.4
```

## Accessing the EKS cluster with kubectl
Expand All @@ -116,7 +116,7 @@ Test the access to the EKS cluster. Get pods and nodes
```
[ssm-user@ip-10-0-0-240 ~]$ kubectl get nodes
NAME STATUS ROLES AGE VERSION
ip-10-0-0-60.ap-southeast-1.compute.internal Ready <none> 19h v1.31.0-eks-a737599
ip-10-0-0-60.ap-southeast-1.compute.internal Ready <none> 19h v1.32.3-eks-473151a

[ssm-user@ip-10-0-0-240 ~]$ kubectl get pods -A
NAMESPACE NAME READY STATUS RESTARTS AGE
Expand Down
6 changes: 3 additions & 3 deletions java/eks/private-cluster/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<cdk.version>2.175.1</cdk.version>
<kubectl.version>2.0.0</kubectl.version>
<cdk.version>2.198.0</cdk.version>
<kubectl.version>2.1.0</kubectl.version>
<constructs.version>[10.0.0,11.0.0)</constructs.version>
<junit.version>5.7.1</junit.version>
</properties>
Expand Down Expand Up @@ -47,7 +47,7 @@

<dependency>
<groupId>software.amazon.awscdk</groupId>
<artifactId>cdk-lambda-layer-kubectl-v31</artifactId>
<artifactId>cdk-lambda-layer-kubectl-v32</artifactId>
<version>${kubectl.version}</version>
</dependency>

Expand Down
6 changes: 3 additions & 3 deletions .../eks/private-cluster/src/main/java/com/amazonaws/cdk/examples/EksPrivateClusterStack.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import java.util.Map;
import software.amazon.awscdk.Stack;
import software.amazon.awscdk.StackProps;
import software.amazon.awscdk.cdk.lambdalayer.kubectl.v31.KubectlV31Layer;
import software.amazon.awscdk.cdk.lambdalayer.kubectl.v32.KubectlV32Layer;
import software.amazon.awscdk.services.autoscaling.AutoScalingGroup;
import software.amazon.awscdk.services.ec2.BastionHostLinux;
import software.amazon.awscdk.services.ec2.BlockDevice;
Expand Down Expand Up @@ -89,12 +89,12 @@ private void createEksCluster(Role clusterAdmin) {
this.cluster =
Cluster.Builder.create(this, "eks")
.vpc(vpc)
.version(KubernetesVersion.V1_31)
.version(KubernetesVersion.V1_32)
.vpcSubnets(
List.of(SubnetSelection.builder().subnetType(SubnetType.PRIVATE_ISOLATED).build()))
.endpointAccess(EndpointAccess.PRIVATE)
.clusterName("eks-private")
.kubectlLayer(new KubectlV31Layer(this, "KubectlLayer"))
.kubectlLayer(new KubectlV32Layer(this, "KubectlLayer"))
.defaultCapacity(0)
.mastersRole(clusterAdmin)
.placeClusterHandlerInVpc(true)
Expand Down
2 changes: 1 addition & 1 deletion .../private-cluster/src/test/java/com/amazonaws/cdk/examples/EksPrivateClusterStackTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public void testEksClusterNameVersion() {
"Config",
Map.of(
"name", "eks-private",
"version", "1.31"))),
"version", "1.32"))),
1);
}

Expand Down
Loading