Skip to content

Commit f245a47

Browse files
Pothulapatiroboquat
authored andcommitted
[local-preview] Update status messages to depend on echo'sh
With the removal of `-x` option in bash, We can't rely on the commands anymore and instead have to start using `echo` messages to match statuses in `prettylog`. This PR updates the remaining statuses on the same. Signed-off-by: Tarun Pothulapati <[email protected]>
1 parent d686ea9 commit f245a47

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

install/preview/entrypoint.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ done
197197

198198
ctr images pull "docker.io/gitpod/workspace-full:latest" >/dev/null &
199199

200+
echo "images pulled"
200201
/gitpod-installer render --use-experimental-config --config config.yaml --output-split-files /var/lib/rancher/k3s/server/manifests/gitpod
201202

202203
# store files in `gitpod.debug` for debugging purposes
@@ -235,6 +236,7 @@ mv -f /app/manifests/coredns.yaml /var/lib/rancher/k3s/server/manifests/custom-c
235236
for f in /var/lib/rancher/k3s/server/manifests/gitpod/*.yaml; do (cat "$f"; echo) >> /var/lib/rancher/k3s/server/manifests/gitpod.yaml; done
236237
rm -rf /var/lib/rancher/k3s/server/manifests/gitpod
237238

239+
echo "manifests generated"
238240
# waits for gitpod pods to be ready, and manually runs the `gitpod-telemetry` cronjob
239241
run_telemetry(){
240242
# wait for the k3s cluster to be ready and Gitpod workloads are added

install/preview/prettylog/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ var (
3131
}{
3232
{Msg: "checking prerequisites", Fail: "requires a system with at least", Success: "Gitpod Domain:", Status: "checking prerequisites"},
3333
{Msg: "preparing system", Success: "extracting images to download ahead"},
34-
{Msg: "downloading images", Success: "--output-split-files"},
35-
{Msg: "preparing Gitpod preview installation", Success: "rm -rf /var/lib/rancher/k3s/server/manifests/gitpod"},
34+
{Msg: "downloading images", Success: "images pulled"},
35+
{Msg: "preparing Gitpod preview installation", Success: "manifests generated"},
3636
{Msg: "starting Gitpod", Success: "Gitpod pods are ready", Status: "starting gitpod"},
3737
{Msg: fmt.Sprintf("Gitpod is running. Visit https://%s to access the dashboard", os.Getenv("DOMAIN")), Status: "gitpod ready"},
3838
}

0 commit comments

Comments
 (0)