Skip to content

Commit 5a385d3

Browse files
authored
replace AmazonLinux2 amis with AmazonLinux2023 | remove override-bootstrap test in custom_ami tests (#8666)
1 parent add5ac4 commit 5a385d3

2 files changed

Lines changed: 1 addition & 23 deletions

File tree

integration/tests/custom_ami/custom_ami_test.go

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -130,28 +130,6 @@ var _ = Describe("(Integration) [Test Custom AMI]", func() {
130130
})
131131
})
132132

133-
Context("override bootstrap command for managed and un-managed nodegroups", func() {
134-
135-
It("can create a working nodegroup which can join the cluster", func() {
136-
By(fmt.Sprintf("using the following EKS optimised AMI: %s", customAMIAL2))
137-
content, err := os.ReadFile(filepath.Join("testdata/override-bootstrap.yaml"))
138-
Expect(err).NotTo(HaveOccurred())
139-
content = bytes.ReplaceAll(content, []byte("<generated>"), []byte(params.ClusterName))
140-
content = bytes.ReplaceAll(content, []byte("<generated-region>"), []byte(params.Region))
141-
content = bytes.ReplaceAll(content, []byte("<generated-ami>"), []byte(customAMIAL2))
142-
cmd := params.EksctlCreateCmd.
143-
WithArgs(
144-
"nodegroup",
145-
"--config-file", "-",
146-
"--verbose", "4",
147-
).
148-
WithoutArg("--region", params.Region).
149-
WithStdin(bytes.NewReader(content))
150-
Expect(cmd).To(RunSuccessfully())
151-
})
152-
153-
})
154-
155133
Context("bottlerocket un-managed nodegroups", func() {
156134

157135
It("can create a working nodegroup which can join the cluster", func() {

integration/tests/dry_run/dry_run_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ var _ = Describe("(Integration) [Dry-Run test]", func() {
287287
Memory: "4",
288288
}
289289

290-
}, "--managed=false", "--instance-selector-vcpus=2", "--instance-selector-memory=4", "--node-ami-family=AmazonLinux2"),
290+
}, "--managed=false", "--instance-selector-vcpus=2", "--instance-selector-memory=4", "--node-ami-family=AmazonLinux2023"),
291291

292292
Entry("instance selector options with managed nodegroup", func(actual, expected *api.ClusterConfig) {
293293
Expect(actual.ManagedNodeGroups[0].InstanceTypes).NotTo(BeEmpty())

0 commit comments

Comments
 (0)