Merge pull request #1 from varun-armis/compare-with-upstream

Compare with upstream
varun-armis · Jan 30, 2024 · 75ec18f · 75ec18f
2 parents 2cd9093 + 8b0f878
commit 75ec18f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/eks-worker-al2.json b/eks-worker-al2.json
@@ -165,6 +165,13 @@
         "ENABLE_FIPS={{user `enable_fips`}}"
       ]
     },
+    {
+      "type": "shell",
+      "remote_folder": "{{ user `remote_folder`}}",
+      "inline": [
+        "sudo sed -i 's/^net.ipv4.ip_forward = 0$/net.ipv4.ip_forward = 1/' /etc/sysctl.conf"
+      ]
+    },
     {
       "type": "shell",
       "remote_folder": "{{ user `remote_folder`}}",

diff --git a/files/kubelet-containerd.service b/files/kubelet-containerd.service
@@ -6,7 +6,7 @@ Requires=containerd.service sandbox-image.service
 
 [Service]
 Slice=runtime.slice
-ExecStartPre=/sbin/iptables -P FORWARD ACCEPT -w 5
+ExecStartPre=/sbin/iptables -P FORWARD ACCEPT -w 5 ; /sbin/iptables -I INPUT -p tcp -m tcp --dport 10250 -j ACCEPT
 ExecStart=/usr/bin/kubelet \
     --config /etc/kubernetes/kubelet/kubelet-config.json \
     --kubeconfig /var/lib/kubelet/kubeconfig \

diff --git a/scripts/generate-version-info.sh b/scripts/generate-version-info.sh
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+# open issue:
+#   https://github.com/awslabs/amazon-eks-ami/pull/1513
+#   https://github.com/awslabs/amazon-eks-ami/pull/1556
+
 # generates a JSON file containing version information for the software in this AMI
 
 set -o errexit
@@ -16,14 +20,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 /bin/aws --version | awk '{print $1}' | cut -d '/' -f 2)
 if [ "$?" != 0 ]; then
   echo "unable to get aws cli version"
   exit 1

diff --git a/scripts/install-worker.sh b/scripts/install-worker.sh
@@ -304,7 +304,7 @@ for binary in ${BINARIES[*]}; do
     sudo wget $S3_URL_BASE/$binary.sha256
   fi
   sudo sha256sum -c $binary.sha256
-  sudo chmod +x $binary
+  sudo chmod 755 $binary
   sudo mv $binary /usr/bin/
 done