diff --git a/go.mod b/go.mod index ae2cf4a828bb..b6b11a86e6f1 100644 --- a/go.mod +++ b/go.mod @@ -32,7 +32,7 @@ require ( k8s.io/utils v0.0.0-20240102154912-e7106e64919e knative.dev/pkg v0.0.0-20231010144348-ca8c009405dd sigs.k8s.io/controller-runtime v0.18.4 - sigs.k8s.io/karpenter v1.0.3-0.20240930210524-ced4d37eda82 + sigs.k8s.io/karpenter v1.0.3 sigs.k8s.io/yaml v1.4.0 ) diff --git a/go.sum b/go.sum index a033be8ef239..0951215a564c 100644 --- a/go.sum +++ b/go.sum @@ -761,8 +761,8 @@ sigs.k8s.io/controller-runtime v0.18.4 h1:87+guW1zhvuPLh1PHybKdYFLU0YJp4FhJRmiHv sigs.k8s.io/controller-runtime v0.18.4/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= -sigs.k8s.io/karpenter v1.0.3-0.20240930210524-ced4d37eda82 h1:kKll2aUiWasrhrIkZF2fwSC7T5snCirfTQV3mjn0rH4= -sigs.k8s.io/karpenter v1.0.3-0.20240930210524-ced4d37eda82/go.mod h1:3NLmsnHHw8p4VutpjTOPUZyhE3qH6yGTs8O94Lsu8uw= +sigs.k8s.io/karpenter v1.0.3 h1:T1gCvEBnQAhfzetRoPgHKoevEXuPa70odZvzGelf5vM= +sigs.k8s.io/karpenter v1.0.3/go.mod h1:3NLmsnHHw8p4VutpjTOPUZyhE3qH6yGTs8O94Lsu8uw= sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= diff --git a/test/suites/ami/suite_test.go b/test/suites/ami/suite_test.go index 7ab83cb377c5..8ac10a874339 100644 --- a/test/suites/ami/suite_test.go +++ b/test/suites/ami/suite_test.go @@ -87,7 +87,7 @@ var _ = Describe("AMI", func() { }) It("should use the most recent AMI when discovering multiple", func() { // choose an old static image that will definitely have an older creation date - oldCustomAMI := env.GetAMIBySSMPath(fmt.Sprintf("/aws/service/eks/optimized-ami/%[1]s/amazon-linux-2023/x86_64/standard/amazon-eks-node-al2023-x86_64-standard-%[1]s-v20240514/image_id", env.K8sVersion())) + oldCustomAMI := env.GetAMIBySSMPath(fmt.Sprintf("/aws/service/eks/optimized-ami/%[1]s/amazon-linux-2023/x86_64/standard/amazon-eks-node-al2023-x86_64-standard-%[1]s-v20240514/image_id", env.K8sVersionWithOffset(1))) nodeClass.Spec.AMIFamily = lo.ToPtr(v1.AMIFamilyAL2023) nodeClass.Spec.AMISelectorTerms = []v1.AMISelectorTerm{ {ID: customAMI}, @@ -168,12 +168,12 @@ var _ = Describe("AMI", func() { env.ExpectCreatedNodeCount("==", 1) }, Entry("AL2023 (latest)", "al2023@latest"), - Entry("AL2023 (pinned)", "al2023@v20240807"), + Entry("AL2023 (pinned)", "al2023@v20240928"), Entry("AL2 (latest)", "al2@latest"), - Entry("AL2 (pinned)", "al2@v20240807"), + Entry("AL2 (pinned)", "al2@v20240928"), Entry("Bottlerocket (latest)", "bottlerocket@latest"), - Entry("Bottlerocket (pinned with v prefix)", "bottlerocket@v1.21.0"), - Entry("Bottlerocket (pinned without v prefix)", "bottlerocket@1.21.0"), + Entry("Bottlerocket (pinned with v prefix)", "bottlerocket@v1.24.0"), + Entry("Bottlerocket (pinned without v prefix)", "bottlerocket@1.24.0"), ) It("should support Custom AMIFamily with AMI Selectors", func() { al2023AMI := env.GetAMIBySSMPath(fmt.Sprintf("/aws/service/eks/optimized-ami/%s/amazon-linux-2023/x86_64/standard/recommended/image_id", env.K8sVersion()))