From 4f26ed5c55d3797685226e3c00b6251402c7a9f1 Mon Sep 17 00:00:00 2001
From: Zachary Bailey <t-zbailey@microsoft.com>
Date: Wed, 10 Apr 2024 15:12:31 -0700
Subject: [PATCH] fix: revert changes

---
 vhdbuilder/packer/install-dependencies.sh | 51 +++--------------------
 1 file changed, 6 insertions(+), 45 deletions(-)

diff --git a/vhdbuilder/packer/install-dependencies.sh b/vhdbuilder/packer/install-dependencies.sh
index 1098c8347c9..7d9a59a1c8c 100644
--- a/vhdbuilder/packer/install-dependencies.sh
+++ b/vhdbuilder/packer/install-dependencies.sh
@@ -258,17 +258,11 @@ ls -ltr /opt/gpu/* >> ${VHD_LOGS_FILEPATH}
 installBpftrace
 echo "  - $(bpftrace --version)" >> ${VHD_LOGS_FILEPATH}
 
-PARENT_DIR=$(pwd)
-
-( 
-  cd $PARENT_DIR || { echo "Subshell in the wrong directory" >&2; exit 1; }
-
-  installBcc
-
-  exit $?
-) > /tmp/bcc.log 2>&1 &
-
-BCC_PID=$!
+installBcc
+cat << EOF >> ${VHD_LOGS_FILEPATH}
+  - bcc-tools
+  - libbcc-examples
+EOF
 
 echo "${CONTAINER_RUNTIME} images pre-pulled:" >> ${VHD_LOGS_FILEPATH}
 stop_watch $capture_time "Pull NVIDIA driver image (mcr), Start installBcc subshell" false
@@ -278,8 +272,6 @@ string_replace() {
   echo ${1//\*/$2}
 }
 
-declare -a containerImagePids=()
-
 ContainerImages=$(jq ".ContainerImages" $COMPONENTS_FILEPATH | jq .[] --monochrome-output --compact-output)
 for imageToBePulled in ${ContainerImages[*]}; do
   downloadURL=$(echo "${imageToBePulled}" | jq .downloadURL -r)
@@ -304,13 +296,8 @@ for imageToBePulled in ${ContainerImages[*]}; do
   for version in ${versions}; do
     CONTAINER_IMAGE=$(string_replace $downloadURL $version)
     pullContainerImage ${cliTool} ${CONTAINER_IMAGE}
-    #containerImagePids+=($!)
     echo "  - ${CONTAINER_IMAGE}" >> ${VHD_LOGS_FILEPATH}
-    #while [[ $(jobs -p | wc -l) -ge 13 ]]; do # 13 maximum parallel container image pulls
-      #wait -n
-    #done    
   done
-  #wait ${containerImagePids[@]}
 done
 
 watcher=$(jq '.ContainerImages[] | select(.downloadURL | contains("aks-node-ca-watcher"))' $COMPONENTS_FILEPATH)
@@ -445,23 +432,11 @@ rm -r /var/log/azure/Microsoft.Azure.Extensions.CustomScript || exit 1
 
 KUBE_PROXY_IMAGE_VERSIONS=$(jq -r '.containerdKubeProxyImages.ContainerImages[0].multiArchVersions[]' <"$THIS_DIR/kube-proxy-images.json")
 
-declare -a kubeProxyPids=()
-
 for KUBE_PROXY_IMAGE_VERSION in ${KUBE_PROXY_IMAGE_VERSIONS}; do
   # use kube-proxy as well
   CONTAINER_IMAGE="mcr.microsoft.com/oss/kubernetes/kube-proxy:v${KUBE_PROXY_IMAGE_VERSION}"
   pullContainerImage ${cliTool} ${CONTAINER_IMAGE}
-  kubeProxyPids+=($!)
-  while [[ $(jobs -p | wc -l) -ge 13 ]]; do # 13 maximum parallel container image pulls
-    wait -n
-  done
-done
-wait ${kubeProxyPids[@]} # Wait for all background processes to finish
-
-for KUBE_PROXY_IMAGE_VERSION in ${KUBE_PROXY_IMAGE_VERSIONS}; do
-  # use kube-proxy as well
-  CONTAINER_IMAGE="mcr.microsoft.com/oss/kubernetes/kube-proxy:v${KUBE_PROXY_IMAGE_VERSION}"
-  ctr --namespace k8s.io run --rm ${CONTAINER_IMAGE} checkTask /bin/sh -c "iptables --version" | grep -v nf_tables && echo "kube-proxy contains     no nf_tables" 
+  ctr --namespace k8s.io run --rm ${CONTAINER_IMAGE} checkTask /bin/sh -c "iptables --version" | grep -v nf_tables && echo "kube-proxy contains no nf_tables"
 
   # shellcheck disable=SC2181
   echo "  - ${CONTAINER_IMAGE}" >>${VHD_LOGS_FILEPATH}
@@ -508,20 +483,6 @@ if [[ $OS == $UBUNTU_OS_NAME ]]; then
   sed -i 's/After=network-online.target/After=multi-user.target/g' /lib/systemd/system/motd-news.service
 fi
 
-wait $BCC_PID
-BCC_EXIT_CODE=$?
-
-if [ $BCC_EXIT_CODE -eq 0 ]; then
-  # Append the package names to ${VHD_LOGS_FILEPATH}
-  cat << EOF >> ${VHD_LOGS_FILEPATH}
-  - bcc-tools
-  - libbcc-examples
-EOF
-else
-  # Handle the subshell failure
-  echo "Error: installBcc Subshell failed with exit code $BCC_EXIT_CODE" >&2
-fi
-
 # use the private_packages_url to download and cache packages
 if [[ -n ${PRIVATE_PACKAGES_URL} ]]; then
   IFS=',' read -ra PRIVATE_URLS <<< "${PRIVATE_PACKAGES_URL}"