Skip to content
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.

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

Already on GitHub? Sign in to your account

Support for EKS 1.25 #6290

Merged
merged 4 commits into from
Feb 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions pkg/actions/cluster/upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@ func getNextVersion(currentVersion string) (string, error) {
return api.Version1_24, nil
case api.Version1_24:
return api.Version1_25, nil
case api.Version1_25:
return api.Version1_26, nil
default:
// version of control plane is not known to us, maybe we are just too old...
return "", fmt.Errorf("control plane version %q is not known to this version of eksctl, try to upgrade eksctl first", currentVersion)
Expand Down
4 changes: 2 additions & 2 deletions pkg/actions/cluster/upgrade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@ var _ = Describe("upgrade cluster", func() {
}),

Entry("fails when the version is still not supported", upgradeCase{
givenVersion: "1.25",
givenVersion: "1.26",
eksVersion: api.LatestVersion,
expectedErrorText: "control plane version \"1.25\" is not known to this version of eksctl",
expectedErrorText: "control plane version \"1.26\" is not known to this version of eksctl",
}),
)
})
2 changes: 1 addition & 1 deletion pkg/actions/nodegroup/testdata/al2-updated-template.json
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
]
},
"NodegroupName": "amazonlinux2",
"ReleaseVersion": "1.24-20201212",
"ReleaseVersion": "1.25-20201212",
"ScalingConfig": {
"DesiredSize": 4,
"MaxSize": 4,
Expand Down
2 changes: 1 addition & 1 deletion pkg/actions/nodegroup/testdata/br-updated-template.json
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
"alpha.eksctl.io/nodegroup-name": "br",
"alpha.eksctl.io/nodegroup-type": "managed"
},
"Version": "1.24"
"Version": "1.25"
}
},
"NodeInstanceRole": {
Expand Down
Loading