Skip to content

Commit

Permalink
Merge pull request #123 from OneideLuizSchneider/feature/new-ami-rele…
Browse files Browse the repository at this point in the history
…ase-08-18-24-ada86dc727956f780e56c92a9b96a5b57032dba8

New AMI version for EKS - Auto-PR
  • Loading branch information
OneideLuizSchneider authored Aug 18, 2024
2 parents ada86dc + 8a30b99 commit 079880e
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 0 deletions.
8 changes: 8 additions & 0 deletions amazon-eks-ami/nodeadm/internal/kubelet/eni-max-pods.txt
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,14 @@ g6.48xlarge 737
g6.4xlarge 234
g6.8xlarge 234
g6.xlarge 58
g6e.12xlarge 292
g6e.16xlarge 737
g6e.24xlarge 492
g6e.2xlarge 58
g6e.48xlarge 492
g6e.4xlarge 234
g6e.8xlarge 234
g6e.xlarge 58
gr6.4xlarge 234
gr6.8xlarge 234
h1.16xlarge 394
Expand Down
3 changes: 3 additions & 0 deletions amazon-eks-ami/templates/al2/provisioners/install-worker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,7 @@ if [[ "$CACHE_CONTAINER_IMAGES" == "true" ]] && ! [[ ${ISOLATED_REGIONS} =~ $BIN
REGIONS=$(aws ec2 describe-regions --all-regions --output text --query 'Regions[].[RegionName]')

for img in "${CACHE_IMGS[@]:-}"; do
if [ -z "${img}" ]; then continue; fi
## only kube-proxy-minimal is vended for K8s 1.24+
if [[ "${img}" == *"kube-proxy:"* ]] && [[ "${img}" != *"-minimal-"* ]] && vercmp "${K8S_MINOR_VERSION}" gteq "1.24"; then
continue
Expand All @@ -458,6 +459,7 @@ if [[ "$CACHE_CONTAINER_IMAGES" == "true" ]] && ! [[ ${ISOLATED_REGIONS} =~ $BIN
## iterate through decrementing the build version each time
for build_version in $(seq "${eksbuild_version}" -1 1); do
img=$(echo "${img}" | sed -E "s/eksbuild.[0-9]+/eksbuild.${build_version}/")
echo "Pulling image [${img}]"
if /etc/eks/containerd/pull-image.sh "${img}"; then
PULLED_IMGS+=("${img}")
break
Expand All @@ -470,6 +472,7 @@ if [[ "$CACHE_CONTAINER_IMAGES" == "true" ]] && ! [[ ${ISOLATED_REGIONS} =~ $BIN
#### Tag the pulled down image for all other regions in the partition
for region in ${REGIONS[*]}; do
for img in "${PULLED_IMGS[@]:-}"; do
if [ -z "${img}" ]; then continue; fi
region_uri=$(/etc/eks/get-ecr-uri.sh "${region}" "${AWS_DOMAIN}")
regional_img="${img/$ECR_URI/$region_uri}"
sudo ctr -n k8s.io image tag "${img}" "${regional_img}" || :
Expand Down
8 changes: 8 additions & 0 deletions amazon-eks-ami/templates/shared/runtime/eni-max-pods.txt
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,14 @@ g6.48xlarge 737
g6.4xlarge 234
g6.8xlarge 234
g6.xlarge 58
g6e.12xlarge 292
g6e.16xlarge 737
g6e.24xlarge 492
g6e.2xlarge 58
g6e.48xlarge 492
g6e.4xlarge 234
g6e.8xlarge 234
g6e.xlarge 58
gr6.4xlarge 234
gr6.8xlarge 234
h1.16xlarge 394
Expand Down

0 comments on commit 079880e

Please sign in to comment.