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

Miscellaneous fixes from AL2023 testing #1528

Merged
merged 1 commit into from
Nov 24, 2023
Merged

Miscellaneous fixes from AL2023 testing #1528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion files/bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ fi

log "INFO: Using IP family: ${IP_FAMILY}"

echo $B64_CLUSTER_CA | base64 -d > $CA_CERTIFICATE_FILE_PATH
echo "$B64_CLUSTER_CA" | base64 -d > $CA_CERTIFICATE_FILE_PATH

sed -i s,MASTER_ENDPOINT,$APISERVER_ENDPOINT,g /var/lib/kubelet/kubeconfig
sed -i s,AWS_REGION,$AWS_DEFAULT_REGION,g /var/lib/kubelet/kubeconfig
Expand Down
12 changes: 9 additions & 3 deletions scripts/install-worker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,19 @@ fi
if cat /etc/*release | grep "al2023" > /dev/null 2>&1; then
# exists in al2023 only (needed by kubelet)
sudo yum install -y iptables-legacy

# Remove the amazon-ec2-net-utils package, if it's installed. This package interferes with the route setup on the instance.
if yum list installed | grep amazon-ec2-net-utils; then sudo yum remove amazon-ec2-net-utils -y -q; fi
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this still valid on AL2023 or is it just a carryover from AL2? Based on this statement in the project https://github.com/amazonlinux/amazon-ec2-net-utils#usage - have we reached out to the EC2 net utils project/team to figure out the proper solution instead of simply removing the package?

Copy link
Member Author

Choose a reason for hiding this comment

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

@bryantbiggs not doing it idly :) been struggling with this one for 2 days now and finally figured out that the package name was different! https://testgrid.k8s.io/amazon-ec2#Conformance%20-%20EC2/EKS/AL2023%20-%20master&width=20

Copy link
Contributor

Choose a reason for hiding this comment

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

This #368 (comment) has the TL;DR on why ec2-net-utils is not compatible with aws-vpc-cni..

Copy link
Member Author

Choose a reason for hiding this comment

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

@jayanthvn @bryantbiggs opened an issue on the other side: amazonlinux/amazon-ec2-net-utils#100


# Temporary fix for https://github.com/aws/amazon-vpc-cni-k8s/pull/2118
sed -i "s/^MACAddressPolicy=.*/MACAddressPolicy=none/" /usr/lib/systemd/network/99-default.link
else
# curl-minimal already exists in al2023 so install curl only on al2
sudo yum install -y curl
fi

# Remove the ec2-net-utils package, if it's installed. This package interferes with the route setup on the instance.
if yum list installed | grep ec2-net-utils; then sudo yum remove ec2-net-utils -y -q; fi
# Remove the ec2-net-utils package, if it's installed. This package interferes with the route setup on the instance.
if yum list installed | grep ec2-net-utils; then sudo yum remove ec2-net-utils -y -q; fi
fi

sudo mkdir -p /etc/eks/

Expand Down