Skip to content

Commit

Permalink
Miscellaneous fixes from AL2023 testing (awslabs#1528)
Browse files Browse the repository at this point in the history
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
  • Loading branch information
dims authored and atmosx committed Jun 18, 2024
1 parent de9414f commit 97dcb98
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion files/bootstrap.sh
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
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

# 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

0 comments on commit 97dcb98

Please sign in to comment.