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.

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

Jump to bottom

Fix build issue when using CIS hardened AMIs for base images #1964

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
Open

Fix build issue when using CIS hardened AMIs for base images #1964

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
68d44ae
Sync main branch to CodeCommit (#1654)
cartermckinnon Feb 12, 2024
5d9020b
Add warning about default branch change (#1655)
cartermckinnon Feb 12, 2024
e988b53
Change docs branch to main (#1657)
cartermckinnon Feb 12, 2024
8bb63f5
Update CHANGELOG.md for release v20240209 (#1660)
github-actions[bot] Feb 13, 2024
743862d
Added missing build target for v1.29; corrected issue with generate-v…
dawidpichen Feb 13, 2024
3d86914
Corrected version in comment
dawidpichen Feb 13, 2024
1a66915
Removed unnecessary 1.29 target from Makefile
Feb 15, 2024
19b77aa
Add warning about default branch change (#1655)
cartermckinnon Feb 12, 2024
351ef4f
Update CHANGELOG.md for release v20240209 (#1660)
github-actions[bot] Feb 13, 2024
5d286d7
Added missing build target for v1.29; corrected issue with generate-v…
dawidpichen Feb 13, 2024
085e4e6
Corrected version in comment
dawidpichen Feb 13, 2024
99948fb
Removed unnecessary 1.29 target from Makefile
Feb 15, 2024
fa7008b
Merge branch 'master' of https://github.com/dawidpichen/amazon-eks-ami
Jun 19, 2024
f5e0809
Merge branch 'awslabs:main' into master
dawidpichen Sep 14, 2024
ce4e6e1
Restored original files
Sep 14, 2024
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
4 changes: 2 additions & 2 deletions templates/shared/provisioners/generate-version-info.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ OUTPUT_FILE="$1"
sudo rpm --query --all --queryformat '\{"%{NAME}": "%{VERSION}-%{RELEASE}"\}\n' | jq --slurp --sort-keys 'add | {packages:(.)}' > "$OUTPUT_FILE"

# binaries
KUBELET_VERSION=$(kubelet --version | awk '{print $2}')
KUBELET_VERSION=$(sudo kubelet --version | awk '{print $2}')
if [ "$?" != 0 ]; then
echo "unable to get kubelet version"
exit 1
fi
echo $(jq ".binaries.kubelet = \"$KUBELET_VERSION\"" $OUTPUT_FILE) > $OUTPUT_FILE

CLI_VERSION=$(aws --version | awk '{print $1}' | cut -d '/' -f 2)
CLI_VERSION=$(sudo aws --version | awk '{print $1}' | cut -d '/' -f 2)
if [ "$?" != 0 ]; then
echo "unable to get aws cli version"
exit 1
Expand Down