better handle non eks optimized amis #2073
Open
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes:
When running the log collector script on OS images other than the standard AL2/23 eks optimized ami and without the vpc-cni, there are a few potentially confusing log messages due to missing files/execs. This adds:
command -v
checks around specific bins,lvs
pvs
vgs
ipvsadm
ipset
conntrack
aws-eks-na-cli
similar to others within this script./var/run/aws-node/ipam.json
does not exist.The one somewhat functional change is to handle Ubuntu nodes. Ubuntu is
INIT_TYPE
snap
in the script and when kubelet logs are retrieve the snapkubelet-eks
is assumed to exist. The change checks for existence of thekubelet-eks
snap and if it does not exist, falls back to the normal kubelet log collecting. Without this change, the kubelet logs would not be collected for these kinds of nodes.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
Old Output:
New Output:
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.