Skip to content
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.

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

Name node with Instance Id for AL2023 AMI #1589

Merged
merged 2 commits into from
Jan 22, 2024

Conversation

Issacwww
Copy link
Member

Issue #, if available:

Description of changes:
Name AL2023 Nodes using Instance Id

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

Testing Done

make test

Build AL2023 1.23 and 1.28 AMI and tested with kubetest2

Example output for 1.23 test

kubetest2-eksapi --kubernetes-version=1.23 --up --user-data-format=nodeadm --unmanaged-nodes --ami  ami-0265683842cb535c7 --node-name-strategy=SessionName --nodes=2

I0121 18:04:32.773468   77125 nodegroup.go:298] ASG instances are using expected AMI: ami-0265683842cb535c7
I0121 18:04:32.773501   77125 k8s.go:29] waiting up to 5m0s for 2 node(s) to be ready...
I0121 18:04:35.222935   77125 k8s.go:69] 2 node(s) are ready: map[i-04ed8f1da1c2e8496:{} i-0fb6efa3e0701f34e:{}]

k get nodes
NAME                  STATUS   ROLES    AGE   VERSION
i-04ed8f1da1c2e8496   Ready    <none>   71m   v1.23.17-eks-5e0fdde
i-0fb6efa3e0701f34e   Ready    <none>   71m   v1.23.17-eks-5e0fdde

See this guide for recommended testing for PRs. Some tests may not apply. Completing tests and providing additional validation steps are not required, but it is recommended and may reduce review time and time to merge.

Comment on lines 207 to 208
// --container-runtime-endpoint moved to kubelet config start from 1.27
kubeletArguments["container-runtime-endpoint"] = "unix:///run/containerd/containerd.sock"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wow i didn't think to check that, nice catch

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lemme update this into the comment!

@ndbaker1 ndbaker1 merged commit 7b4ed3c into awslabs:al2023 Jan 22, 2024
6 checks passed
if semver.Compare(kubeletVersion, "v1.27.0") < 0 {
// --container-runtime flag is gone in 1.27+
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we have this logic for all the versions and remove this configuration from kubelet-containerd.service file?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants