Skip to content

Commit

Permalink
[local-preview] Remove unused dead code
Browse files Browse the repository at this point in the history
This PR removes the unnecessary dead code in the
`entrypoint.sh` that isn't actually useful anymore,
or become stale.

Signed-off-by: Tarun Pothulapati <tarun@gitpod.io>

update k3s image

Signed-off-by: Tarun Pothulapati <tarun@gitpod.io>
  • Loading branch information
Pothulapati committed Sep 7, 2022
1 parent bf9157a commit 36ff04c
Showing 1 changed file with 3 additions and 11 deletions.
14 changes: 3 additions & 11 deletions install/preview/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,6 @@ if [ "$1" != "logging" ]; then
exit
fi

# fail if its arm64
if [ "$(uname -m)" = 'arm64' ]; then
echo "Gitpod local preview does not work on arm64 CPU's (including M1 Mac's)"
exit 1
fi

# check for minimum requirements
REQUIRED_MEM_KB=$((6 * 1024 * 1024))
total_mem_kb=$(awk '/MemTotal:/ {print $2}' /proc/meminfo)
Expand All @@ -43,17 +37,15 @@ fi

echo "Gitpod Domain: $DOMAIN"

# With cgroupv2, We need to move the k3s processes into the
# init group when we override the entrypoint in the container
if [ -f /sys/fs/cgroup/cgroup.controllers ]; then
echo "[$(date -Iseconds)] [CgroupV2 Fix] Evacuating Root Cgroup ..."
# move the processes from the root group to the /init group,
# otherwise writing subtree_control fails with EBUSY.
mkdir -p /sys/fs/cgroup/init
busybox xargs -rn1 < /sys/fs/cgroup/cgroup.procs > /sys/fs/cgroup/init/cgroup.procs || :
# enable controllers
sed -e 's/ / +/g' -e 's/^/+/' <"/sys/fs/cgroup/cgroup.controllers" >"/sys/fs/cgroup/cgroup.subtree_control"
echo "[$(date -Iseconds)] [CgroupV2 Fix] Done"
fi


mount --make-shared /sys/fs/cgroup
mount --make-shared /proc
mount --make-shared /var/gitpod
Expand Down

0 comments on commit 36ff04c

Please sign in to comment.