Miscellaneous fixes from AL2023 testing (#1528)

Signed-off-by: Davanum Srinivas <[email protected]>
awslabs · Nov 24, 2023 · fc8815c · fc8815c
1 parent 1c779bf
commit fc8815c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/files/bootstrap.sh b/files/bootstrap.sh
@@ -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

diff --git a/scripts/install-worker.sh b/scripts/install-worker.sh
@@ -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/