Skip to content

Commit eba5da5

Browse files
guessiguessi
committed
chore(go/eks): refresh sample code and set Amazon EKS version as 1.31
1 parent 9f35cea commit eba5da5

File tree

8 files changed

+147
-126
lines changed

8 files changed

+147
-126
lines changed

‎go/eks/cluster-graviton/cluster.go‎

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"github.com/aws/aws-cdk-go/awscdk/v2/awseks"
77
"github.com/aws/constructs-go/constructs/v10"
88
"github.com/aws/jsii-runtime-go"
9-
kubectlv28 "github.com/cdklabs/awscdk-kubectl-go/kubectlv28/v2"
9+
kubectl "github.com/cdklabs/awscdk-kubectl-go/kubectlv31/v2"
1010
)
1111

1212
type ClusterStackProps struct {
@@ -27,10 +27,10 @@ func NewClusterStack(scope constructs.Construct, id string, props *ClusterStackP
2727
eksCluster := awseks.NewCluster(stack, jsii.String("Cluster"), &awseks.ClusterProps{
2828
Vpc: vpc,
2929
DefaultCapacity: jsii.Number(0), // manage capacity with managed nodegroups later since we want to customize nodegroup
30-
KubectlLayer: kubectlv28.NewKubectlV28Layer(stack, jsii.String("kubectl128layer")),
31-
Version: awseks.KubernetesVersion_V1_28(),
30+
KubectlLayer: kubectl.NewKubectlV31Layer(stack, jsii.String("kubectl131layer")),
31+
Version: awseks.KubernetesVersion_V1_31(),
3232
AlbController: &awseks.AlbControllerOptions{
33-
Version: awseks.AlbControllerVersion_V2_6_2(),
33+
Version: awseks.AlbControllerVersion_V2_8_2(),
3434
},
3535
})
3636

@@ -40,38 +40,37 @@ func NewClusterStack(scope constructs.Construct, id string, props *ClusterStackP
4040
InstanceTypes: &[]awsec2.InstanceType{
4141
awsec2.NewInstanceType(jsii.String("t4g.medium")),
4242
},
43-
MinSize: jsii.Number(2),
44-
DiskSize: jsii.Number(100),
45-
AmiType: awseks.NodegroupAmiType_AL2_ARM_64,
43+
DesiredSize: jsii.Number(2),
44+
MinSize: jsii.Number(2),
45+
MaxSize: jsii.Number(5),
46+
DiskSize: jsii.Number(100),
47+
AmiType: awseks.NodegroupAmiType_AL2023_ARM_64_STANDARD,
4648
})
4749

4850
// Fargate Profile
4951
awseks.NewFargateProfile(stack, jsii.String("MyProfile"), &awseks.FargateProfileProps{
5052
Cluster: eksCluster,
5153
Selectors: &[]*awseks.Selector{
52-
&awseks.Selector{
54+
{
5355
Namespace: jsii.String("default"),
5456
},
5557
},
5658
})
5759

58-
// Managed Addon: kube-proxy
59-
awseks.NewCfnAddon(stack, jsii.String("CfnAddonKubeProxy"), &awseks.CfnAddonProps{
60-
AddonName: jsii.String("kube-proxy"),
61-
ClusterName: eksCluster.ClusterName(),
62-
})
63-
64-
// Managed Addon: vpc-cni
65-
awseks.NewCfnAddon(stack, jsii.String("CfnAddonVpcCni"), &awseks.CfnAddonProps{
66-
AddonName: jsii.String("vpc-cni"),
67-
ClusterName: eksCluster.ClusterName(),
68-
})
60+
// Create common addon configuration function to reduce code duplication
61+
addManagedAddon := func(name string, id string) {
62+
awseks.NewCfnAddon(stack, jsii.String(id), &awseks.CfnAddonProps{
63+
AddonName: jsii.String(name),
64+
ClusterName: eksCluster.ClusterName(),
65+
})
66+
}
6967

70-
// Managed Addon: coredns
71-
awseks.NewCfnAddon(stack, jsii.String("CfnAddonCoreDns"), &awseks.CfnAddonProps{
72-
AddonName: jsii.String("coredns"),
73-
ClusterName: eksCluster.ClusterName(),
74-
})
68+
// Create required addons using the helper function
69+
addManagedAddon("kube-proxy", "CfnAddonKubeProxy")
70+
addManagedAddon("vpc-cni", "CfnAddonVpcCni")
71+
addManagedAddon("coredns", "CfnAddonCoreDns")
72+
addManagedAddon("eks-pod-identity-agent", "CfnAddonEksPodIdentityAgent")
73+
addManagedAddon("metrics-server", "CfnAddonMetricsServer")
7574

7675
return stack
7776
}

‎go/eks/cluster-graviton/cluster_test.go‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ func TestClusterStack(t *testing.T) {
2727

2828
// Cluster
2929
clusterVersion := template.Get("Resources.Cluster9EE0221C.Properties.Config.version").String()
30-
assert.Equal(t, "1.28", clusterVersion)
30+
assert.Equal(t, "1.31", clusterVersion)
3131

3232
ipFamily := template.Get("Resources.Cluster9EE0221C.Properties.Config.kubernetesNetworkConfig.ipFamily").String()
3333
assert.Equal(t, "ipv4", ipFamily)
3434

3535
// Managed Node Group
3636
maxSize := template.Get("Resources.ClusterNodegroupcustomnodegroupF798ADA7.Properties.ScalingConfig.MaxSize").Int()
37-
assert.Equal(t, int64(2), maxSize)
37+
assert.Equal(t, int64(5), maxSize)
3838

3939
minSize := template.Get("Resources.ClusterNodegroupcustomnodegroupF798ADA7.Properties.ScalingConfig.MinSize").Int()
4040
assert.Equal(t, int64(2), minSize)
@@ -46,7 +46,7 @@ func TestClusterStack(t *testing.T) {
4646
assert.Equal(t, int64(100), diskSize)
4747

4848
amiType := template.Get("Resources.ClusterNodegroupcustomnodegroupF798ADA7.Properties.AmiType").String()
49-
assert.Equal(t, "AL2_ARM_64", amiType)
49+
assert.Equal(t, "AL2023_ARM_64_STANDARD", amiType)
5050

5151
// Fargate
5252
fargateProfileNamespace := template.Get("Resources.MyProfileC56205EE.Properties.Config.selectors.0.namespace").String()
@@ -62,6 +62,12 @@ func TestClusterStack(t *testing.T) {
6262
addonNameCoreDns := template.Get("Resources.CfnAddonCoreDns.Properties.AddonName").String()
6363
assert.Equal(t, "coredns", addonNameCoreDns)
6464

65+
addonNameEksPodIdentityAgent := template.Get("Resources.CfnAddonEksPodIdentityAgent.Properties.AddonName").String()
66+
assert.Equal(t, "eks-pod-identity-agent", addonNameEksPodIdentityAgent)
67+
68+
addonNameMetricsServer := template.Get("Resources.CfnAddonMetricsServer.Properties.AddonName").String()
69+
assert.Equal(t, "metrics-server", addonNameMetricsServer)
70+
6571
// AWS Load Balancer Controller
6672
albRelease := template.Get("Resources.TestStackCluster8E857178AlbController95870509.Properties.Release").String()
6773
assert.Equal(t, "aws-load-balancer-controller", albRelease)

‎go/eks/cluster-graviton/go.mod‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,36 @@
11
module cluster
22

3-
go 1.21
3+
go 1.23
44

55
require (
6-
github.com/aws/aws-cdk-go/awscdk/v2 v2.130.0
7-
github.com/aws/constructs-go/constructs/v10 v10.3.0
8-
github.com/aws/jsii-runtime-go v1.94.0
9-
github.com/cdklabs/awscdk-kubectl-go/kubectlv28/v2 v2.2.0
10-
github.com/stretchr/testify v1.8.4
6+
github.com/aws/aws-cdk-go/awscdk/v2 v2.175.1
7+
github.com/aws/constructs-go/constructs/v10 v10.4.2
8+
github.com/aws/jsii-runtime-go v1.106.0
9+
github.com/cdklabs/awscdk-kubectl-go/kubectlv31/v2 v2.0.0
10+
github.com/stretchr/testify v1.10.0
1111

1212
// for testing
13-
github.com/tidwall/gjson v1.17.1
13+
github.com/tidwall/gjson v1.18.0
1414
)
1515

1616
require (
17-
github.com/Masterminds/semver/v3 v3.2.1 // indirect
18-
github.com/cdklabs/awscdk-asset-awscli-go/awscliv1/v2 v2.2.202 // indirect
19-
github.com/cdklabs/awscdk-asset-kubectl-go/kubectlv20/v2 v2.1.2 // indirect
20-
github.com/cdklabs/awscdk-asset-node-proxy-agent-go/nodeproxyagentv6/v2 v2.0.1 // indirect
17+
github.com/Masterminds/semver/v3 v3.3.1 // indirect
18+
github.com/cdklabs/awscdk-asset-awscli-go/awscliv1/v2 v2.2.208 // indirect
19+
github.com/cdklabs/awscdk-asset-kubectl-go/kubectlv20/v2 v2.1.3 // indirect
20+
github.com/cdklabs/awscdk-asset-node-proxy-agent-go/nodeproxyagentv6/v2 v2.1.0 // indirect
21+
github.com/cdklabs/cloud-assembly-schema-go/awscdkcloudassemblyschema/v39 v39.1.34 // indirect
2122
github.com/davecgh/go-spew v1.1.1 // indirect
22-
github.com/fatih/color v1.16.0 // indirect
23+
github.com/fatih/color v1.18.0 // indirect
2324
github.com/mattn/go-colorable v0.1.13 // indirect
2425
github.com/mattn/go-isatty v0.0.20 // indirect
2526
github.com/pmezard/go-difflib v1.0.0 // indirect
2627
github.com/tidwall/match v1.1.1 // indirect
2728
github.com/tidwall/pretty v1.2.1 // indirect
2829
github.com/yuin/goldmark v1.7.0 // indirect
2930
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
30-
golang.org/x/mod v0.15.0 // indirect
31-
golang.org/x/sys v0.17.0 // indirect
32-
golang.org/x/tools v0.18.0 // indirect
31+
golang.org/x/mod v0.22.0 // indirect
32+
golang.org/x/sync v0.10.0 // indirect
33+
golang.org/x/sys v0.28.0 // indirect
34+
golang.org/x/tools v0.28.0 // indirect
3335
gopkg.in/yaml.v3 v3.0.1 // indirect
3436
)

‎go/eks/cluster-graviton/go.sum‎

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,38 @@
1-
github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0=
2-
github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
3-
github.com/aws/aws-cdk-go/awscdk/v2 v2.130.0 h1:89c3plfxwtxV+GaY1nMjhWOFsUrufEpykrVRTa/rVYk=
4-
github.com/aws/aws-cdk-go/awscdk/v2 v2.130.0/go.mod h1:TpmJwOnoajvRtwnLlJoxEoppb9sVoCLfPGLdgoTDH7o=
5-
github.com/aws/constructs-go/constructs/v10 v10.3.0 h1:LsjBIMiaDX/vqrXWhzTquBJ9pPdi02/H+z1DCwg0PEM=
6-
github.com/aws/constructs-go/constructs/v10 v10.3.0/go.mod h1:GgzwIwoRJ2UYsr3SU+JhAl+gq5j39bEMYf8ev3J+s9s=
7-
github.com/aws/jsii-runtime-go v1.94.0 h1:VuVDx0xL2gbsJthUMfP+SwAXGkSEQd0GKm0ydZ8xga8=
8-
github.com/aws/jsii-runtime-go v1.94.0/go.mod h1:tQOz8aAMzM2XsRUDsnUgPvGcHNAzR/xtH0OgeM0lTWo=
9-
github.com/cdklabs/awscdk-asset-awscli-go/awscliv1/v2 v2.2.202 h1:VixXB9DnHN8oP7pXipq8GVFPjWCOdeNxIaS/ZyUwTkI=
10-
github.com/cdklabs/awscdk-asset-awscli-go/awscliv1/v2 v2.2.202/go.mod h1:iPUti/SWjA3XAS3CpnLciFjS8TN9Y+8mdZgDfSgcyus=
11-
github.com/cdklabs/awscdk-asset-kubectl-go/kubectlv20/v2 v2.1.2 h1:k+WD+6cERd59Mao84v0QtRrcdZuuSMfzlEmuIypKnVs=
12-
github.com/cdklabs/awscdk-asset-kubectl-go/kubectlv20/v2 v2.1.2/go.mod h1:CvFHBo0qcg8LUkJqIxQtP1rD/sNGv9bX3L2vHT2FUAo=
13-
github.com/cdklabs/awscdk-asset-node-proxy-agent-go/nodeproxyagentv6/v2 v2.0.1 h1:MBBQNKKPJ5GArbctgwpiCy7KmwGjHDjUUH5wEzwIq8w=
14-
github.com/cdklabs/awscdk-asset-node-proxy-agent-go/nodeproxyagentv6/v2 v2.0.1/go.mod h1:/2WiXEft9s8ViJjD01CJqDuyJ8HXBjhBLtK5OvJfdSc=
15-
github.com/cdklabs/awscdk-kubectl-go/kubectlv28/v2 v2.2.0 h1:KfBHrHpbF8XbPZPZTSfBEhmPv+k0MKXOxY7t0Sfpbjo=
16-
github.com/cdklabs/awscdk-kubectl-go/kubectlv28/v2 v2.2.0/go.mod h1:G6HdIkMWjg9UL1Cgjd4bMMKFqp8I1eClgLY+IMRjnlE=
1+
github.com/Masterminds/semver/v3 v3.3.1 h1:QtNSWtVZ3nBfk8mAOu/B6v7FMJ+NHTIgUPi7rj+4nv4=
2+
github.com/Masterminds/semver/v3 v3.3.1/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
3+
github.com/aws/aws-cdk-go/awscdk/v2 v2.175.1 h1:LRocYTYhy3b2xE743X7QW1zDdK/csSBj0mgKna99A1A=
4+
github.com/aws/aws-cdk-go/awscdk/v2 v2.175.1/go.mod h1:XmbvfJtG3yL0j7qyO/5VmkzR6aVcnMM2esXp0VxKuqY=
5+
github.com/aws/constructs-go/constructs/v10 v10.4.2 h1:+hDLTsFGLJmKIn0Dg20vWpKBrVnFrEWYgTEY5UiTEG8=
6+
github.com/aws/constructs-go/constructs/v10 v10.4.2/go.mod h1:cXsNCKDV+9eR9zYYfwy6QuE4uPFp6jsq6TtH1MwBx9w=
7+
github.com/aws/jsii-runtime-go v1.106.0 h1:wClD7enF+FOGR6l2TQ6STcE1nEIVKdODbipl5ZrbyC8=
8+
github.com/aws/jsii-runtime-go v1.106.0/go.mod h1:HMdZwwcI8gpwetrneEa/RUkefS194IeCeh8eJQP3xSk=
9+
github.com/cdklabs/awscdk-asset-awscli-go/awscliv1/v2 v2.2.208 h1:paqCb41y89OFA3+APC7buPjM6Izq8Q0yMgkGSGf/QJI=
10+
github.com/cdklabs/awscdk-asset-awscli-go/awscliv1/v2 v2.2.208/go.mod h1:zydxApP2CyfXc3jMpJdyb1ERPNVXaCH/LJTKfWfzUBA=
11+
github.com/cdklabs/awscdk-asset-kubectl-go/kubectlv20/v2 v2.1.3 h1:u63i5K09xASBNGEM0hpD2z0JwO+iNLVzG74VG85OjDo=
12+
github.com/cdklabs/awscdk-asset-kubectl-go/kubectlv20/v2 v2.1.3/go.mod h1:0xP6iiSIKPKsShb6T2kadnTq61wL+kwmHTHnEjkFZFI=
13+
github.com/cdklabs/awscdk-asset-node-proxy-agent-go/nodeproxyagentv6/v2 v2.1.0 h1:kElXjprC8wkpJu58vp+WFH6z0AJw4zitg5iSKJPKe3c=
14+
github.com/cdklabs/awscdk-asset-node-proxy-agent-go/nodeproxyagentv6/v2 v2.1.0/go.mod h1:JY4UnvNa1YDGQ4H5wohXTHl6YVY3uCDUWl4JYUrQfb8=
15+
github.com/cdklabs/awscdk-kubectl-go/kubectlv31/v2 v2.0.0 h1:avgwIb4IdgapdRMVMxj9jFm6Ndkl+bGOopi14xajaQ0=
16+
github.com/cdklabs/awscdk-kubectl-go/kubectlv31/v2 v2.0.0/go.mod h1:FpH7j7GvSAvweZeIvSdPDEWe8/s/Lzco5GHcl+mAyQ0=
17+
github.com/cdklabs/cloud-assembly-schema-go/awscdkcloudassemblyschema/v39 v39.1.34 h1:ObFlfGCEAIUWHZnExynucV/1pegE1mTolBpd3J9kgIk=
18+
github.com/cdklabs/cloud-assembly-schema-go/awscdkcloudassemblyschema/v39 v39.1.34/go.mod h1:9QiFxM66GW99YsAIO06RSB2xge7wUs97jNzMOevksc0=
1719
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
1820
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
19-
github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
20-
github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
21+
github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
22+
github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
23+
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
24+
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
2125
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
2226
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
2327
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
2428
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
2529
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
2630
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
2731
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
28-
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
29-
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
30-
github.com/tidwall/gjson v1.17.1 h1:wlYEnwqAHgzmhNUFfw7Xalt2JzQvsMx2Se4PcoFCT/U=
31-
github.com/tidwall/gjson v1.17.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
32+
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
33+
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
34+
github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=
35+
github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
3236
github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
3337
github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
3438
github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
@@ -41,23 +45,23 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
4145
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug=
4246
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
4347
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
44-
golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8=
45-
golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
48+
golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
49+
golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
4650
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
4751
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
4852
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
49-
golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
50-
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
53+
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
54+
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
5155
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
5256
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
5357
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
5458
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
55-
golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
56-
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
59+
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
60+
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
5761
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
5862
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
59-
golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ=
60-
golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg=
63+
golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8=
64+
golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw=
6165
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
6266
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
6367
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

‎go/eks/cluster/cluster.go‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"github.com/aws/aws-cdk-go/awscdk/v2/awseks"
77
"github.com/aws/constructs-go/constructs/v10"
88
"github.com/aws/jsii-runtime-go"
9-
kubectlv28 "github.com/cdklabs/awscdk-kubectl-go/kubectlv28/v2"
9+
kubectl "github.com/cdklabs/awscdk-kubectl-go/kubectlv31/v2"
1010
)
1111

1212
type ClusterStackProps struct {
@@ -20,25 +20,29 @@ func NewClusterStack(scope constructs.Construct, id string, props *ClusterStackP
2020
}
2121
stack := awscdk.NewStack(scope, &id, &sprops)
2222

23+
// VPC
2324
vpc := awsec2.NewVpc(stack, jsii.String("EKSVpc"), nil) // Create a new VPC for our cluster
2425

2526
// Cluster
2627
eksCluster := awseks.NewCluster(stack, jsii.String("EKSCluster"), &awseks.ClusterProps{
2728
Vpc: vpc,
2829
DefaultCapacity: jsii.Number(0), // manage capacity with managed nodegroups later since we want to customize nodegroup
29-
KubectlLayer: kubectlv28.NewKubectlV28Layer(stack, jsii.String("kubectl128layer")),
30-
Version: awseks.KubernetesVersion_V1_28(),
30+
KubectlLayer: kubectl.NewKubectlV31Layer(stack, jsii.String("kubectl131layer")),
31+
Version: awseks.KubernetesVersion_V1_31(),
3132
})
3233

3334
// Managed Node Group
3435
eksCluster.AddNodegroupCapacity(
3536
jsii.String("custom-node-group"), &awseks.NodegroupOptions{
3637
InstanceTypes: &[]awsec2.InstanceType{
3738
awsec2.NewInstanceType(jsii.String("t3.medium")),
39+
awsec2.NewInstanceType(jsii.String("t3a.medium")),
3840
},
39-
MinSize: jsii.Number(2),
40-
DiskSize: jsii.Number(100),
41-
AmiType: awseks.NodegroupAmiType_AL2_X86_64,
41+
DesiredSize: jsii.Number(2),
42+
MinSize: jsii.Number(2),
43+
MaxSize: jsii.Number(5),
44+
DiskSize: jsii.Number(100),
45+
AmiType: awseks.NodegroupAmiType_AL2023_X86_64_STANDARD,
4246
})
4347

4448
// Fargate Profile

‎go/eks/cluster/cluster_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ func TestClusterStack(t *testing.T) {
2727

2828
// Cluster
2929
clusterVersion := template.Get("Resources.EKSClusterE11008B6.Properties.Config.version").String()
30-
assert.Equal(t, "1.28", clusterVersion)
30+
assert.Equal(t, "1.31", clusterVersion)
3131

3232
ipFamily := template.Get("Resources.EKSClusterE11008B6.Properties.Config.kubernetesNetworkConfig.ipFamily").String()
3333
assert.Equal(t, "ipv4", ipFamily)
3434

3535
// Managed Node Group
3636
maxSize := template.Get("Resources.EKSClusterNodegroupcustomnodegroup2F3798CA.Properties.ScalingConfig.MaxSize").Int()
37-
assert.Equal(t, int64(2), maxSize)
37+
assert.Equal(t, int64(5), maxSize)
3838

3939
minSize := template.Get("Resources.EKSClusterNodegroupcustomnodegroup2F3798CA.Properties.ScalingConfig.MinSize").Int()
4040
assert.Equal(t, int64(2), minSize)
@@ -46,7 +46,7 @@ func TestClusterStack(t *testing.T) {
4646
assert.Equal(t, int64(100), diskSize)
4747

4848
amiType := template.Get("Resources.EKSClusterNodegroupcustomnodegroup2F3798CA.Properties.AmiType").String()
49-
assert.Equal(t, "AL2_x86_64", amiType)
49+
assert.Equal(t, "AL2023_x86_64_STANDARD", amiType)
5050

5151
// Fargate
5252
fargateProfileNamespace := template.Get("Resources.MyProfileC56205EE.Properties.Config.selectors.0.namespace").String()

0 commit comments

Comments
 (0)