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

Bump CAPAS to 0.1.26 and fix network bugs #2286

Merged
merged 1 commit into from
Jul 3, 2023

Conversation

yxinchen
Copy link
Contributor

@yxinchen yxinchen commented Jul 3, 2023

Issue #, if available:
Sometimes DNIs are not showing in order in ip -br link, causing dni and assigned ip pool doesn't match.

Description of changes:

  • Sort network interface by name.
  • Bump CAPAS to 0.1.26, to include the network fix from capas

Testing:

  • manually built a node ami using the new script, successfully created a cluster and confirmed DNIs were in order in the list.
ubuntu@chy-eksa-poc-8lm2t:~$ ip -br link
lo               UNKNOWN        00:00:00:00:00:00 <LOOPBACK,UP,LOWER_UP>
ens3             UP             52:54:00:4a:e2:bc <BROADCAST,MULTICAST,UP,LOWER_UP>
ens5             UP             92:21:7f:c4:2d:cb <BROADCAST,MULTICAST,UP,LOWER_UP>
ens6             UP             42:f4:3f:1c:20:fd <BROADCAST,MULTICAST,UP,LOWER_UP>
ens7             UP             da:f5:de:73:f1:bc <BROADCAST,MULTICAST,UP,LOWER_UP>
ens10            UP             0e:ff:1a:dd:55:17 <BROADCAST,MULTICAST,UP,LOWER_UP>
ens11            UP             f2:1f:4d:04:94:d5 <BROADCAST,MULTICAST,UP,LOWER_UP>
ens8             UP             d2:d6:3f:28:b9:9d <BROADCAST,MULTICAST,UP,LOWER_UP>
ens9             UP             86:0b:58:60:5b:6b <BROADCAST,MULTICAST,UP,LOWER_UP>
ubuntu@chy-eksa-poc-8lm2t:~$
++ ip -br link
++ awk '{print $2}'
++ sort -n
++ sed 's/^\([^0-9]*\)\([0-9][0-9]*\)/\2   \1\2/'
++ awk '{print $1}'
++ grep -Ev 'ens3|lo'
+ DNI_LIST='ens5
ens6
ens7
ens8
ens9
ens10
ens11'

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

@eks-distro-bot
Copy link
Collaborator

Hi @yxinchen. Thanks for your PR.

I'm waiting for a aws member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@eks-distro-bot eks-distro-bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jul 3, 2023
@yxinchen yxinchen changed the title Sort Snow direct network interface by name. Bump CAPAS to 0.1.26 and fix network bugs Jul 3, 2023
@taneyland
Copy link
Member

/lgtm
/approve

@eks-distro-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: taneyland

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@taneyland
Copy link
Member

/cherrypick release-0.16

@eks-distro-pr-bot
Copy link
Contributor

@taneyland: once the present PR merges, I will cherry-pick it on top of release-0.16 in a new PR and assign it to you.

In response to this:

/cherrypick release-0.16

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@eks-distro-bot eks-distro-bot merged commit 5074120 into aws:main Jul 3, 2023
@eks-distro-pr-bot
Copy link
Contributor

@taneyland: #2286 failed to apply on top of branch "release-0.16":

Applying: * Sort Snow direct network interface by name. * Bump CAPAS to 0.1.26
Using index info to reconstruct a base tree...
M	projects/kubernetes-sigs/image-builder/packer/ami/additional_files/bootstrap.sh
Falling back to patching base and 3-way merge...
Auto-merging projects/kubernetes-sigs/image-builder/packer/ami/additional_files/bootstrap.sh
CONFLICT (content): Merge conflict in projects/kubernetes-sigs/image-builder/packer/ami/additional_files/bootstrap.sh
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 * Sort Snow direct network interface by name. * Bump CAPAS to 0.1.26
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-0.16

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@taneyland
Copy link
Member

/cherrypick release-0.16

@eks-distro-pr-bot
Copy link
Contributor

@taneyland: new pull request created: #2289

In response to this:

/cherrypick release-0.16

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm needs-ok-to-test size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants