Skip to content

Commit ace3ad1

Browse files
authored
Update default cluster version to Kubernetes v1.34 (#8645)
Update default cluster version to Kubernetes v1.34
1 parent d965e8e commit ace3ad1

File tree

4 files changed

+16
-5
lines changed

4 files changed

+16
-5
lines changed

pkg/actions/addon/update_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,7 @@ var _ = Describe("Update", func() {
695695

696696
addonManager, err := addon.New(&api.ClusterConfig{
697697
Metadata: &api.ClusterMeta{
698-
Version: api.Version1_32,
698+
Version: api.DefaultVersion,
699699
Name: clusterName,
700700
},
701701
AddonsConfig: e.addonsConfig,

pkg/apis/eksctl.io/v1alpha5/types.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,14 @@ const (
4848
Version1_31 = "1.31"
4949
Version1_32 = "1.32"
5050
Version1_33 = "1.33"
51+
Version1_34 = "1.34"
5152
DockershimDeprecationVersion = Version1_24
5253
AmazonLinux2EOLVersion = Version1_33
5354
// EFABuiltInSupportVersion defines the minimum Kubernetes version that supports built-in EFA
5455
EFABuiltInSupportVersion = Version1_33
5556
//TODO: Remove this and replace with output from DescribeClusterVersions endpoint
5657
// DefaultVersion (default)
57-
DefaultVersion = Version1_32
58+
DefaultVersion = Version1_34
5859
)
5960

6061
const (

pkg/cfn/builder/managed_nodegroup_ami_type_test.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,19 @@ type amiTypeEntry struct {
2222
nodeGroup *api.ManagedNodeGroup
2323

2424
expectedAMIType string
25+
clusterVersion string
2526
}
2627

2728
var _ = DescribeTable("Managed Nodegroup AMI type", func(e amiTypeEntry) {
2829
clusterConfig := api.NewClusterConfig()
2930
clusterConfig.Status = &api.ClusterStatus{
3031
Endpoint: "https://test.com",
3132
}
33+
if e.clusterVersion != "" {
34+
clusterConfig.Metadata.Version = e.clusterVersion
35+
} else {
36+
clusterConfig.Metadata.Version = api.DefaultVersion
37+
}
3238
err := api.SetManagedNodeGroupDefaults(e.nodeGroup, clusterConfig.Metadata, false)
3339
Expect(err).NotTo(HaveOccurred())
3440
p := mockprovider.NewMockProvider()
@@ -76,6 +82,7 @@ var _ = DescribeTable("Managed Nodegroup AMI type", func(e amiTypeEntry) {
7682
},
7783
},
7884
expectedAMIType: "AL2_x86_64",
85+
clusterVersion: api.Version1_32,
7986
}),
8087

8188
Entry("default Nvidia GPU instance type", amiTypeEntry{
@@ -107,6 +114,7 @@ var _ = DescribeTable("Managed Nodegroup AMI type", func(e amiTypeEntry) {
107114
},
108115
},
109116
expectedAMIType: "AL2_x86_64_GPU",
117+
clusterVersion: api.Version1_32,
110118
}),
111119

112120
Entry("default ARM instance type", amiTypeEntry{
@@ -128,6 +136,7 @@ var _ = DescribeTable("Managed Nodegroup AMI type", func(e amiTypeEntry) {
128136
},
129137
},
130138
expectedAMIType: "AL2_ARM_64",
139+
clusterVersion: api.Version1_32,
131140
}),
132141

133142
Entry("Bottlerocket AMI type", amiTypeEntry{

pkg/ctl/cmdutils/filter/nodegroup_filter_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package filter
33
import (
44
"bytes"
55
"context"
6+
"fmt"
67

78
"github.com/aws/aws-sdk-go-v2/aws"
89
"github.com/aws/aws-sdk-go-v2/service/eks"
@@ -341,14 +342,14 @@ func addGroupB(cfg *api.ClusterConfig) {
341342
ng.SSH = nil
342343
}
343344

344-
const expected = `
345+
var expected = fmt.Sprintf(`
345346
{
346347
"kind": "ClusterConfig",
347348
"apiVersion": "eksctl.io/v1alpha5",
348349
"metadata": {
349350
"name": "test-3x3-ngs",
350351
"region": "eu-central-1",
351-
"version": "1.32"
352+
"version": "%s"
352353
},
353354
"upgradePolicy": {},
354355
"kubernetesNetworkConfig": {
@@ -656,7 +657,7 @@ const expected = `
656657
}
657658
]
658659
}
659-
`
660+
`, api.DefaultVersion)
660661

661662
type mockStackLister struct {
662663
nodesResult []manager.NodeGroupStack

0 commit comments

Comments
 (0)