Skip to content

Commit

Permalink
Merge pull request #7781 from cPu1/eks-1.30
Browse files Browse the repository at this point in the history
Support EKS 1.30
  • Loading branch information
cPu1 committed May 23, 2024
2 parents 6c2665a + 04abf58 commit 5c1ddc7
Show file tree
Hide file tree
Showing 9 changed files with 420 additions and 19 deletions.
2 changes: 2 additions & 0 deletions pkg/actions/cluster/upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ func getNextVersion(currentVersion string) (string, error) {
return api.Version1_29, nil
case api.Version1_29:
return api.Version1_30, nil
case api.Version1_30:
return api.Version1_31, 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
5 changes: 2 additions & 3 deletions pkg/actions/cluster/upgrade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package cluster

import (
. "github.com/onsi/ginkgo/v2"

. "github.com/onsi/gomega"

api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
Expand Down Expand Up @@ -87,9 +86,9 @@ var _ = Describe("upgrade cluster", func() {
}),

Entry("fails when the version is still not supported", upgradeCase{
givenVersion: "1.30",
givenVersion: "1.31",
eksVersion: api.LatestVersion,
expectedErrorText: "control plane version \"1.30\" is not known to this version of eksctl",
expectedErrorText: "control plane version \"1.31\" is not known to this version of eksctl",
}),
)
})
4 changes: 2 additions & 2 deletions pkg/actions/nodegroup/testdata/al2-updated-template.json
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
]
},
"NodegroupName": "amazonlinux2",
"ReleaseVersion": "1.29-20201212",
"ReleaseVersion": "1.30-20201212",
"ScalingConfig": {
"DesiredSize": 4,
"MaxSize": 4,
Expand Down Expand Up @@ -213,4 +213,4 @@
}
}
}
}
}
Loading

0 comments on commit 5c1ddc7

Please sign in to comment.