Skip to content

Commit cf1654f

Browse files
DavidBuzatu-Marianustiugov
authored andcommitted
Updated setup script and quickstart guide
Updated path to stargz setup script file Updated file naming in quickstart_guide Updated quickstart guide's steps Signed-off-by: davidbuzatu-marian <[email protected]>
1 parent 59186cc commit cf1654f

File tree

3 files changed

+6
-12
lines changed

3 files changed

+6
-12
lines changed

docs/quickstart_guide.md

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,7 @@ SSD-equipped nodes are highly recommended. Full list of CloudLab nodes can be fo
100100
> To enable runs with `stargz` images, setup kubelet by adding the `stock-only` and `use-stargz`
101101
> flags as follows:
102102
> ```bash
103-
> ./scripts/cloudlab/setup_node.sh stock-only use-stargz > >(tee -a /tmp/vhive-logs
104-
> setup_worker_kubelet.stdout) 2> >(tee -a /tmp/vhive-logs/setup_worker_kubelet.stderr >&2)
103+
> ./scripts/cloudlab/setup_node.sh stock-only use-stargz > >(tee -a /tmp/vhive-logs/setup_node.stdout) 2> >(tee -a /tmp/vhive-logs/setup_node.stderr >&2)
105104
> ```
106105
> **IMPORTANT**
107106
> Currently `stargz` is only supported in native kubelet contexts without firecracker.
@@ -248,7 +247,7 @@ Execute the following below **as a non-root user with sudo rights** using **bash
248247
> To enable runs with `stargz` images, setup kubelet by adding the `stock-only` and `use-stargz`
249248
> flags as follows:
250249
> ```bash
251-
> ./scripts/cloudlab/setup_node.sh; stock-only use-stargz
250+
> ./scripts/cloudlab/setup_node.sh stock-only use-stargz
252251
> ```
253252
> **IMPORTANT**
254253
> Currently `stargz` is only supported in native kubelet contexts without firecracker.
@@ -292,12 +291,6 @@ Execute the following below **as a non-root user with sudo rights** using **bash
292291
./scripts/github_runner/clean_cri_runner.sh
293292
```
294293
295-
> **IMPORTANT:**
296-
> If the setup script was done using the `stock-only` and `use-stargz` flags, add the corresponding flags to the script as follows:
297-
> ```bash
298-
> ./scripts/github_runner/clean_cri_runner.sh stock-only use-stargz
299-
> ```
300-
301294
### 3. Using a Script
302295
This script stops the existing cluster if any, cleans up and then starts a fresh single-node cluster.
303296

scripts/cloudlab/setup_node.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,5 @@ if [ "$SANDBOX" == "firecracker" ]; then
6060
fi
6161

6262
if [ "$USE_STARGZ" == "use-stargz" ]; then
63-
$SCRIPTS/stargz/setup_stock_only_stargz.sh
63+
$SCRIPTS/stargz/setup_stargz.sh
6464
fi

scripts/stargz/setup_stargz.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
44
ROOT="$( cd $DIR && cd ../.. && pwd)"
55
BINS=$ROOT/bin
66
CONFIGS=$ROOT/configs/stargz
7+
STARGZ_VERSION=v0.13.0
78

89
# Get stargz snapshotter tar
9-
wget --continue --quiet https://github.com/containerd/stargz-snapshotter/releases/download/v0.13.0/stargz-snapshotter-v0.13.0-linux-amd64.tar.gz
10+
wget --continue --quiet https://github.com/containerd/stargz-snapshotter/releases/download/${STARGZ_VERSION}/stargz-snapshotter-${STARGZ_VERSION}-linux-amd64.tar.gz
1011

1112
# Copy stargz config
1213
sudo mkdir -p /etc/containerd
1314
sudo cp $CONFIGS/config.toml /etc/containerd/config.toml
1415

1516
# Unzip stargz binary and install it
16-
sudo tar -C /usr/local/bin -xvf stargz-snapshotter-v0.13.0-linux-amd64.tar.gz containerd-stargz-grpc ctr-remote
17+
sudo tar -C /usr/local/bin -xvf stargz-snapshotter-${STARGZ_VERSION}-linux-amd64.tar.gz containerd-stargz-grpc ctr-remote
1718

1819
# Download stargz snapshotter service configuration file
1920
sudo wget -O /etc/systemd/system/stargz-snapshotter.service https://raw.githubusercontent.com/containerd/stargz-snapshotter/main/script/config/etc/systemd/system/stargz-snapshotter.service

0 commit comments

Comments
 (0)