Skip to content

Return an error when container runtime and overrideBootstrapCommand are defined together #5365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jun 8, 2022
Merged

Return an error when container runtime and overrideBootstrapCommand are defined together #5365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1a6d49c
Return an error in case container runtime and overrideBootstrapComman…
Skarlso Jun 1, 2022
df1e2d9
Merge branch 'main' into fix-aws-node-dockershim-containerd
Skarlso Jun 2, 2022
5088f38
Merge branch 'main' into fix-aws-node-dockershim-containerd
Skarlso Jun 3, 2022
b211e3d
Merge branch 'main' into fix-aws-node-dockershim-containerd
Skarlso Jun 7, 2022
b162a74
Merge branch 'main' into fix-aws-node-dockershim-containerd
Skarlso Jun 8, 2022
34d1e08
Merge branch 'main' into fix-aws-node-dockershim-containerd
Skarlso Jun 8, 2022
3f13673
Fixed typo
Skarlso Jun 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions pkg/apis/eksctl.io/v1alpha5/validation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,6 +729,9 @@ func ValidateNodeGroup(i int, ng *NodeGroup) error {
if *ng.ContainerRuntime != ContainerRuntimeDockerD && *ng.ContainerRuntime != ContainerRuntimeContainerD && *ng.ContainerRuntime != ContainerRuntimeDockerForWindows {
return fmt.Errorf("only %s, %s and %s are supported for container runtime", ContainerRuntimeContainerD, ContainerRuntimeDockerD, ContainerRuntimeDockerForWindows)
}
if ng.OverrideBootstrapCommand != nil {
return fmt.Errorf("overrideBootstrapCommand overwrites container runtime setting; please use --container-runtime in the bootsrap script instead")
}
}

if ng.MaxInstanceLifetime != nil {
Expand Down
11 changes: 11 additions & 0 deletions pkg/apis/eksctl.io/v1alpha5/validation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,17 @@ var _ = Describe("ClusterConfig validation", func() {
err = api.ValidateNodeGroup(0, ng0)
Expect(err).NotTo(HaveOccurred())
})

It("containerd cannot be set together with overrideBootstrapCommand", func() {
cfg := api.NewClusterConfig()
ng0 := cfg.NewNodeGroup()
ng0.Name = "node-group"
ng0.AMIFamily = api.NodeImageFamilyAmazonLinux2
ng0.ContainerRuntime = aws.String(api.ContainerRuntimeContainerD)
ng0.OverrideBootstrapCommand = aws.String("bootstrap command")
err := api.ValidateNodeGroup(0, ng0)
Expect(err).To(MatchError(ContainSubstring("overrideBootstrapCommand overwrites container runtime setting; please use --container-runtime in the bootsrap script instead")))
})
})

Describe("nodeGroups[*].ami validation", func() {
Expand Down