Skip to content

Commit

Permalink
Use DescribeClusterVersions API instead of hardcoding EKS version d…
Browse files Browse the repository at this point in the history
…ata (#8144)

use DescribeClusterVersions API instead of hardcoding EKS version data in eksctl
  • Loading branch information
TiberiuGC authored Jan 20, 2025
1 parent a9f115b commit c97eec9
Show file tree
Hide file tree
Showing 36 changed files with 1,288 additions and 511 deletions.
18 changes: 9 additions & 9 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@ require (
github.com/aws/aws-sdk-go-v2 v1.32.8
github.com/aws/aws-sdk-go-v2/config v1.28.9
github.com/aws/aws-sdk-go-v2/credentials v1.17.50
github.com/aws/aws-sdk-go-v2/service/autoscaling v1.51.3
github.com/aws/aws-sdk-go-v2/service/cloudformation v1.56.4
github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.46.5
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.45.2
github.com/aws/aws-sdk-go-v2/service/autoscaling v1.51.5
github.com/aws/aws-sdk-go-v2/service/cloudformation v1.56.5
github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.46.7
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.45.4
github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.48.4
github.com/aws/aws-sdk-go-v2/service/ec2 v1.166.0
github.com/aws/aws-sdk-go-v2/service/eks v1.56.1
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.28.9
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.43.4
github.com/aws/aws-sdk-go-v2/service/iam v1.38.3
github.com/aws/aws-sdk-go-v2/service/eks v1.56.3
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.28.10
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.43.5
github.com/aws/aws-sdk-go-v2/service/iam v1.38.5
github.com/aws/aws-sdk-go-v2/service/kms v1.27.5
github.com/aws/aws-sdk-go-v2/service/outposts v1.48.1
github.com/aws/aws-sdk-go-v2/service/ssm v1.56.3
github.com/aws/aws-sdk-go-v2/service/ssm v1.56.5
github.com/aws/aws-sdk-go-v2/service/sts v1.33.5
github.com/aws/smithy-go v1.22.1
github.com/awslabs/amazon-eks-ami/nodeadm v0.0.0-20240508073157-fbfa1bc129f5
Expand Down
30 changes: 30 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -736,24 +736,50 @@ github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 h1:VaRN3TlFdd6KxX1x3ILT5ynH6HvK
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc=
github.com/aws/aws-sdk-go-v2/service/autoscaling v1.51.3 h1:1QljimH+yYwrCPgmF2S/vnIE/sBEBS0IdZIvE5+bRJY=
github.com/aws/aws-sdk-go-v2/service/autoscaling v1.51.3/go.mod h1:t5bdAowh8MWq51TuDmltU+wtxMl/VaegNwSBaznkUYc=
github.com/aws/aws-sdk-go-v2/service/autoscaling v1.51.4 h1:w4Tdy9sQlJdcF5dZ9H5uRxradA9Mi2Hp4eOHQmxUJhA=
github.com/aws/aws-sdk-go-v2/service/autoscaling v1.51.4/go.mod h1:6klY3glv/b/phmA0CUj38SWNBior8rKtVvAJrAXljis=
github.com/aws/aws-sdk-go-v2/service/autoscaling v1.51.5 h1:cLKnOycNGGGV75XIk2dv5kjYLnxV4XIWVPtQfSa2qd8=
github.com/aws/aws-sdk-go-v2/service/autoscaling v1.51.5/go.mod h1:6klY3glv/b/phmA0CUj38SWNBior8rKtVvAJrAXljis=
github.com/aws/aws-sdk-go-v2/service/cloudformation v1.56.4 h1:uH6So7Ee+2JQf+TKbfifXKUDNN0JfaJ6CgJ6Bh/u1sc=
github.com/aws/aws-sdk-go-v2/service/cloudformation v1.56.4/go.mod h1:GdDLBO8SzD4wvQ6fhqU1QCmvG1waj1MPHL4cBtuSgdQ=
github.com/aws/aws-sdk-go-v2/service/cloudformation v1.56.5 h1:B9a36cMvleRcLb38hgtb7q39LlKEJFcKsA0qBy+4Xgs=
github.com/aws/aws-sdk-go-v2/service/cloudformation v1.56.5/go.mod h1:GdDLBO8SzD4wvQ6fhqU1QCmvG1waj1MPHL4cBtuSgdQ=
github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.46.5 h1:+fSJTvw91AyBSgS7iaPlSe0NVwa1DJqb6F6GClah+0s=
github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.46.5/go.mod h1:2lQF0aEQAXkUf/Td7RqGIuylJlJO6wSv/onvNdShVyA=
github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.46.6 h1:fMIPTKNUEtU0JCBtKEDH0mvhyDBYZ6dEgqpBOYB5hOU=
github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.46.6/go.mod h1:a2KI7mJ3kF1AdkW4Cyu0fl/6G9H+x7J7KD7BZdvLwYg=
github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.46.7 h1:DBhLX1P+nwIXO6xyDqLpdHoGRKAHSM1b5BECVCSNO5s=
github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.46.7/go.mod h1:a2KI7mJ3kF1AdkW4Cyu0fl/6G9H+x7J7KD7BZdvLwYg=
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.45.2 h1:9zwK03mlPPGzTaiLh1AJS6IhOAWDYnVXfZTwdyBhQtg=
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.45.2/go.mod h1:u8Bi6DG9tLOVIS9MNqtE3vh9T6I/U/8RBpYvy/VyMjc=
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.45.3 h1:va7zt8/kkg5zR0TX2r7wCXssdZ4+blRxbsA6IS9XXYI=
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.45.3/go.mod h1:CijDCaRp5sH8QM0LqImyzy5roG8cOtgp2Abj0V/4luk=
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.45.4 h1:20qw4O1b41McWMulR1q2ZPtUjZTE78iiR54PmlmD8DE=
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.45.4/go.mod h1:CijDCaRp5sH8QM0LqImyzy5roG8cOtgp2Abj0V/4luk=
github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.48.4 h1:78+PSLTY1QcbesyoPKAnYRG+jFhcuZr17pGAQVxDTWw=
github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.48.4/go.mod h1:vPpQlrSaeqEX2s/iM5eqaSFUxVtBrpZFP9SOd25AZuY=
github.com/aws/aws-sdk-go-v2/service/ec2 v1.166.0 h1:FDZVMxzXB13cRmHs3t3tH9gme8GhvmjsQXeXFI37OHU=
github.com/aws/aws-sdk-go-v2/service/ec2 v1.166.0/go.mod h1:Wv7N3iFOKVsZNIaw9MOBUmwCkX6VMmQQRFhMrHtNGno=
github.com/aws/aws-sdk-go-v2/service/eks v1.56.1 h1:TbZoGON9WoQSDC86lTA+eDCXTCqJElgM4TTiqdVcSG4=
github.com/aws/aws-sdk-go-v2/service/eks v1.56.1/go.mod h1:kNUWaiotRWCnfQlprrxSMg8ALqbZyA9xLCwKXuLumSk=
github.com/aws/aws-sdk-go-v2/service/eks v1.56.2 h1:NXxglcZhHubtK2SgqavDGkbArM4NYI7QvLr+FpOL3Oo=
github.com/aws/aws-sdk-go-v2/service/eks v1.56.2/go.mod h1:KkH+D6VJmtIVGD9KTxB9yZu4hQP7s9kxWn8lLb7tmVg=
github.com/aws/aws-sdk-go-v2/service/eks v1.56.3 h1:FqupDsZsAzlLzjZwAUJ24PA1H/P0r/O0G7u5O0Iq4T0=
github.com/aws/aws-sdk-go-v2/service/eks v1.56.3/go.mod h1:KkH+D6VJmtIVGD9KTxB9yZu4hQP7s9kxWn8lLb7tmVg=
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.28.9 h1:phUmuRbBmJKpPBbGx34uZJuV1PPg4u0/RMzIecVVR0E=
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.28.9/go.mod h1:EH2+vt500M2IewoiYVo4rP0gfRhIXzh6BDFZ5KbidUI=
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.28.10 h1:/0EH8MuNQp2bDORevPdEgQkipyCzYGh1uSKkl9Aw1Wo=
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.28.10/go.mod h1:EH2+vt500M2IewoiYVo4rP0gfRhIXzh6BDFZ5KbidUI=
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.43.4 h1:tC9S2BkqlMWP3N2t4UasxIhIJSNY5g7EINjz94VK+3U=
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.43.4/go.mod h1:OhWF5Dd6Ge4VW/RcFQKOO0eEv1JInQJoo6/tkCjlvrM=
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.43.5 h1:oEpZAvjZqy4CkpC5WApi1JBVXxxCdPWbOSB2sOaDHD4=
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.43.5/go.mod h1:OhWF5Dd6Ge4VW/RcFQKOO0eEv1JInQJoo6/tkCjlvrM=
github.com/aws/aws-sdk-go-v2/service/iam v1.38.3 h1:2sFIoFzU1IEL9epJWubJm9Dhrn45aTNEJuwsesaCGnk=
github.com/aws/aws-sdk-go-v2/service/iam v1.38.3/go.mod h1:KzlNINwfr/47tKkEhgk0r10/OZq3rjtyWy0txL3lM+I=
github.com/aws/aws-sdk-go-v2/service/iam v1.38.4 h1:440YtmP8Cn6Qp7WHYfvz2/Xzmu1v1Vox/FJnzUDDQGM=
github.com/aws/aws-sdk-go-v2/service/iam v1.38.4/go.mod h1:oXqc4hmGhZpj06Zu8z+ahXhdbjq4Uw8pjN9flty0Ync=
github.com/aws/aws-sdk-go-v2/service/iam v1.38.5 h1:DzMv18mXANjE3nwkTHvXW7TIBIqhKJbKu/pHR6HQfAo=
github.com/aws/aws-sdk-go-v2/service/iam v1.38.5/go.mod h1:oXqc4hmGhZpj06Zu8z+ahXhdbjq4Uw8pjN9flty0Ync=
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 h1:iXtILhvDxB6kPvEXgsDhGaZCSC6LQET5ZHSdJozeI0Y=
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1/go.mod h1:9nu0fVANtYiAePIBh2/pFUSwtJ402hLnp854CNoDOeE=
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.8 h1:cWno7lefSH6Pp+mSznagKCgfDGeZRin66UvYUqAkyeA=
Expand All @@ -766,6 +792,10 @@ github.com/aws/aws-sdk-go-v2/service/pricing v1.17.0 h1:RQOMvPwte2H4ZqsiZmrla1cr
github.com/aws/aws-sdk-go-v2/service/pricing v1.17.0/go.mod h1:LJyh9figH3ZpSiVjR5umzbl6V3EpQdZR4Se1ayoUtfI=
github.com/aws/aws-sdk-go-v2/service/ssm v1.56.3 h1:QMx9lj524IOWjI1IpmcXSkHaazGBzTPgBmECzbppF5s=
github.com/aws/aws-sdk-go-v2/service/ssm v1.56.3/go.mod h1:RKWoqC9FlgMCkrfVOtgfqfwdaUIaq8H93UAt4xNaR0A=
github.com/aws/aws-sdk-go-v2/service/ssm v1.56.4 h1:oXh/PjaKtStu7RkaUtuKX6+h/OxXriMa9WyQQhylKG0=
github.com/aws/aws-sdk-go-v2/service/ssm v1.56.4/go.mod h1:IiHGbiFg4wVdEKrvFi/zxVZbjfEpgSe21N9RwyQFXCU=
github.com/aws/aws-sdk-go-v2/service/ssm v1.56.5 h1:ZQorDO4+5xcNiQKvkg5cGVDPgtwnjglmDBCPRoEM6oU=
github.com/aws/aws-sdk-go-v2/service/ssm v1.56.5/go.mod h1:IiHGbiFg4wVdEKrvFi/zxVZbjfEpgSe21N9RwyQFXCU=
github.com/aws/aws-sdk-go-v2/service/sso v1.24.9 h1:YqtxripbjWb2QLyzRK9pByfEDvgg95gpC2AyDq4hFE8=
github.com/aws/aws-sdk-go-v2/service/sso v1.24.9/go.mod h1:lV8iQpg6OLOfBnqbGMBKYjilBlf633qwHnBEiMSPoHY=
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.8 h1:6dBT1Lz8fK11m22R+AqfRsFn8320K0T5DTGxxOQBSMw=
Expand Down
12 changes: 6 additions & 6 deletions integration/tests/addons/addons_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ var _ = BeforeSuite(func() {
rawClient = getRawClient(context.Background(), params.ClusterName)
serverVersion, err := rawClient.ServerVersion()
Expect(err).NotTo(HaveOccurred())
Expect(serverVersion).To(HavePrefix(api.LatestVersion))
Expect(serverVersion).To(HavePrefix(api.DefaultVersion))

})

Expand Down Expand Up @@ -445,7 +445,7 @@ var _ = Describe("(Integration) [EKS Addons test]", func() {
cmd := params.EksctlUtilsCmd.
WithArgs(
"describe-addon-versions",
"--kubernetes-version", api.LatestVersion,
"--kubernetes-version", api.DefaultVersion,
)
Expect(cmd).To(RunSuccessfullyWithOutputStringLines(
ContainElement(ContainSubstring("vpc-cni")),
Expand All @@ -459,7 +459,7 @@ var _ = Describe("(Integration) [EKS Addons test]", func() {
By(fmt.Sprintf("listing available addon versions for %s", addonWithSchema))
output, err := eksAPI.DescribeAddonVersions(context.Background(), &awseks.DescribeAddonVersionsInput{
AddonName: aws.String(addonWithSchema),
KubernetesVersion: aws.String(api.LatestVersion),
KubernetesVersion: aws.String(api.DefaultVersion),
})
Expect(err).NotTo(HaveOccurred(), "error describing addon versions")
By(fmt.Sprintf("fetching the configuration schema for %s", addonWithSchema))
Expand All @@ -482,7 +482,7 @@ var _ = Describe("(Integration) [EKS Addons test]", func() {
cmd := params.EksctlUtilsCmd.
WithArgs(
"describe-addon-versions",
"--kubernetes-version", api.LatestVersion,
"--kubernetes-version", api.DefaultVersion,
"--types", "networking",
"--owners", "aws",
"--publishers", "eks",
Expand All @@ -498,7 +498,7 @@ var _ = Describe("(Integration) [EKS Addons test]", func() {
cmd := params.EksctlUtilsCmd.
WithArgs(
"describe-addon-versions",
"--kubernetes-version", api.LatestVersion,
"--kubernetes-version", api.DefaultVersion,
"--types", "networking, storage",
)
Expect(cmd).To(RunSuccessfullyWithOutputStringLines(
Expand Down Expand Up @@ -860,7 +860,7 @@ func getRawClient(ctx context.Context, clusterName string) *kubewrapper.RawClien
func getInitialClusterConfig() *api.ClusterConfig {
clusterConfig := api.NewClusterConfig()
clusterConfig.Metadata.Name = params.ClusterName
clusterConfig.Metadata.Version = api.LatestVersion
clusterConfig.Metadata.Version = api.DefaultVersion
clusterConfig.Metadata.Region = params.Region
clusterConfig.IAM.WithOIDC = api.Enabled()
clusterConfig.Addons = []*api.Addon{
Expand Down
2 changes: 1 addition & 1 deletion integration/tests/dry_run/dry_run_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func TestDryRun(t *testing.T) {
testutils.RegisterAndRun(t)
}

const eksVersion = api.LatestVersion
const eksVersion = api.DefaultVersion

const defaultClusterConfig = `
apiVersion: eksctl.io/v1alpha5
Expand Down
2 changes: 1 addition & 1 deletion integration/tests/ipv6/ipv6_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ var _ = BeforeSuite(func() {

clusterConfig = api.NewClusterConfig()
clusterConfig.Metadata.Name = params.ClusterName
clusterConfig.Metadata.Version = api.LatestVersion
clusterConfig.Metadata.Version = api.DefaultVersion
clusterConfig.Metadata.Region = params.Region
clusterConfig.KubernetesNetworkConfig.IPFamily = "iPv6"
clusterConfig.VPC.NAT = nil
Expand Down
10 changes: 7 additions & 3 deletions integration/tests/unowned_cluster/unowned_cluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,13 @@ var _ = BeforeSuite(func() {
mng2 = "mng-2"
stackName = fmt.Sprintf("eksctl-%s", params.ClusterName)

version, upgradeVersion = clusterutils.GetCurrentAndNextVersionsForUpgrade(params.Version)
clusterProvider, err := eks.New(context.Background(), &api.ProviderConfig{Region: params.Region}, cfg)
Expect(err).NotTo(HaveOccurred())

cvm, err := eks.NewClusterVersionsManager(clusterProvider.AWSProvider.EKS())
Expect(err).NotTo(HaveOccurred())

version, upgradeVersion = clusterutils.GetCurrentAndNextVersionsForUpgrade(cvm, params.Version)

cfg = &api.ClusterConfig{
TypeMeta: api.ClusterConfigTypeMeta(),
Expand All @@ -71,8 +77,6 @@ var _ = BeforeSuite(func() {
}

if !params.SkipCreate {
clusterProvider, err := eks.New(context.Background(), &api.ProviderConfig{Region: params.Region}, cfg)
Expect(err).NotTo(HaveOccurred())
ctl = clusterProvider.AWSProvider
ctx := context.Background()
cfg.VPC = createClusterWithNodeGroup(ctx, params.ClusterName, stackName, mng1, version, ctl)
Expand Down
35 changes: 15 additions & 20 deletions integration/tests/update/update_cluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,20 @@ var _ = BeforeSuite(func() {

fmt.Fprintf(GinkgoWriter, "Using kubeconfig: %s\n", params.KubeconfigPath)

eksVersion, nextEKSVersion = clusterutils.GetCurrentAndNextVersionsForUpgrade(params.Version)
cfg := &api.ClusterConfig{
Metadata: &api.ClusterMeta{
Name: params.ClusterName,
Region: params.Region,
},
}
var err error
clusterProvider, err = eks.New(context.Background(), &api.ProviderConfig{Region: params.Region}, cfg)
Expect(err).NotTo(HaveOccurred())

cvm, err := eks.NewClusterVersionsManager(clusterProvider.AWSProvider.EKS())
Expect(err).NotTo(HaveOccurred())

eksVersion, nextEKSVersion = clusterutils.GetCurrentAndNextVersionsForUpgrade(cvm, params.Version)

clusterConfig := api.NewClusterConfig()
clusterConfig.Metadata.Name = defaultCluster
Expand Down Expand Up @@ -141,8 +154,7 @@ var _ = BeforeSuite(func() {
WithStdin(clusterutils.Reader(clusterConfig))
Expect(cmd).To(RunSuccessfully())

var err error
clusterProvider, err = newClusterProvider(context.Background())
err = clusterProvider.RefreshClusterStatus(context.Background(), cfg)
Expect(err).NotTo(HaveOccurred())
})

Expand Down Expand Up @@ -327,23 +339,6 @@ var _ = AfterSuite(func() {
os.RemoveAll(params.TestDirectory)
})

func newClusterProvider(ctx context.Context) (*eks.ClusterProvider, error) {
cfg := &api.ClusterConfig{
Metadata: &api.ClusterMeta{
Name: params.ClusterName,
Region: params.Region,
},
}
ctl, err := eks.New(ctx, &api.ProviderConfig{Region: params.Region}, cfg)
if err != nil {
return nil, err
}
if err := ctl.RefreshClusterStatus(ctx, cfg); err != nil {
return nil, err
}
return ctl, nil
}

func defaultClusterConfig() *api.ClusterConfig {
return &api.ClusterConfig{
Metadata: &api.ClusterMeta{
Expand Down
2 changes: 1 addition & 1 deletion integration/tests/windows/windows_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ var _ = Describe("(Integration) [Windows Nodegroups]", func() {
By("creating a new cluster with Windows nodegroups")
clusterConfig := api.NewClusterConfig()
clusterConfig.Metadata.Name = clusterName
clusterConfig.Metadata.Version = api.LatestVersion
clusterConfig.Metadata.Version = api.DefaultVersion
clusterConfig.Metadata.Region = api.DefaultRegion
clusterConfig.IAM.WithOIDC = &withOIDC

Expand Down
6 changes: 3 additions & 3 deletions integration/utilities/cluster/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ func ParseClusterConfig(clusterName, region, filename string) *api.ClusterConfig
return clusterConfig
}

func GetCurrentAndNextVersionsForUpgrade(testVersion string) (currentVersion, nextVersion string) {
supportedVersions := api.SupportedVersions()
func GetCurrentAndNextVersionsForUpgrade(cvm eks.ClusterVersionsManagerInterface, testVersion string) (currentVersion, nextVersion string) {
supportedVersions := cvm.SupportedVersions()
if len(supportedVersions) < 2 {
Fail("Upgrade test requires at least two supported EKS versions")
}

// if latest version is used, fetch previous version to upgrade from
if testVersion == api.LatestVersion {
if testVersion == cvm.LatestVersion() {
previousVersionIndex := slices.Index(supportedVersions, testVersion) - 1
currentVersion = supportedVersions[previousVersionIndex]
nextVersion = testVersion
Expand Down
4 changes: 2 additions & 2 deletions pkg/actions/addon/update_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ var _ = Describe("Update", func() {
}, nil).Once()
mockProvider.MockEKS().On("DescribeAddonVersions", mock.Anything, &awseks.DescribeAddonVersionsInput{
AddonName: aws.String("vpc-cni"),
KubernetesVersion: aws.String(api.LatestVersion),
KubernetesVersion: aws.String(api.DefaultVersion),
}).Return(&awseks.DescribeAddonVersionsOutput{
Addons: []ekstypes.AddonInfo{
{
Expand Down Expand Up @@ -636,7 +636,7 @@ var _ = Describe("Update", func() {

addonManager, err := addon.New(&api.ClusterConfig{
Metadata: &api.ClusterMeta{
Version: api.LatestVersion,
Version: api.Version1_30,
Name: clusterName,
},
AddonsConfig: e.addonsConfig,
Expand Down
Loading

0 comments on commit c97eec9

Please sign in to comment.