|
42 | 42 | customAMIAL2 string
|
43 | 43 | customAMIAL2023 string
|
44 | 44 | customAMIBottlerocket string
|
45 |
| - customAMIUbuntuPro2004 string |
46 | 45 | customAMIUbuntuPro2204 string
|
47 | 46 | customAMIUbuntuPro2404 string
|
48 | 47 | )
|
@@ -81,14 +80,6 @@ var _ = BeforeSuite(func() {
|
81 | 80 | Expect(err).NotTo(HaveOccurred())
|
82 | 81 | customAMIBottlerocket = *output.Parameter.Value
|
83 | 82 |
|
84 |
| - // retrieve Ubuntu Pro 20.04 AMI |
85 |
| - input = &awsssm.GetParameterInput{ |
86 |
| - Name: aws.String(fmt.Sprintf("/aws/service/canonical/ubuntu/eks-pro/20.04/%s/stable/current/amd64/hvm/ebs-gp2/ami-id", params.Version)), |
87 |
| - } |
88 |
| - output, err = ssm.GetParameter(context.Background(), input) |
89 |
| - Expect(err).NotTo(HaveOccurred()) |
90 |
| - customAMIUbuntuPro2004 = *output.Parameter.Value |
91 |
| - |
92 | 83 | // retrieve Ubuntu Pro 22.04 AMI
|
93 | 84 | input = &awsssm.GetParameterInput{
|
94 | 85 | Name: aws.String(fmt.Sprintf("/aws/service/canonical/ubuntu/eks-pro/22.04/%s/stable/current/amd64/hvm/ebs-gp2/ami-id", params.Version)),
|
@@ -183,28 +174,6 @@ var _ = Describe("(Integration) [Test Custom AMI]", func() {
|
183 | 174 |
|
184 | 175 | })
|
185 | 176 |
|
186 |
| - Context("ubuntu-pro-2004 un-managed nodegroups", func() { |
187 |
| - |
188 |
| - It("can create a working nodegroup which can join the cluster", func() { |
189 |
| - By(fmt.Sprintf("using the following EKS optimised AMI: %s", customAMIUbuntuPro2004)) |
190 |
| - content, err := os.ReadFile(filepath.Join("testdata/ubuntu-pro-2004.yaml")) |
191 |
| - Expect(err).NotTo(HaveOccurred()) |
192 |
| - content = bytes.ReplaceAll(content, []byte("<generated>"), []byte(params.ClusterName)) |
193 |
| - content = bytes.ReplaceAll(content, []byte("<generated-region>"), []byte(params.Region)) |
194 |
| - content = bytes.ReplaceAll(content, []byte("<generated-ami>"), []byte(customAMIUbuntuPro2204)) |
195 |
| - cmd := params.EksctlCreateCmd. |
196 |
| - WithArgs( |
197 |
| - "nodegroup", |
198 |
| - "--config-file", "-", |
199 |
| - "--verbose", "4", |
200 |
| - ). |
201 |
| - WithoutArg("--region", params.Region). |
202 |
| - WithStdin(bytes.NewReader(content)) |
203 |
| - Expect(cmd).To(RunSuccessfully()) |
204 |
| - }) |
205 |
| - |
206 |
| - }) |
207 |
| - |
208 | 177 | Context("ubuntu-pro-2204 un-managed nodegroups", func() {
|
209 | 178 |
|
210 | 179 | It("can create a working nodegroup which can join the cluster", func() {
|
|
0 commit comments