From 5d15c97e8e3ac8e670b9c1d001a1b9caf4c21683 Mon Sep 17 00:00:00 2001 From: hellt Date: Sat, 10 Jan 2026 13:49:17 +0100 Subject: [PATCH 01/29] run with inactivity --- .devcontainer/postCreate.sh | 3 +- .devcontainer/utils.sh | 63 +++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/.devcontainer/postCreate.sh b/.devcontainer/postCreate.sh index 0f2a018..ad503c7 100755 --- a/.devcontainer/postCreate.sh +++ b/.devcontainer/postCreate.sh @@ -5,4 +5,5 @@ cd $EDA_PLAYGROUND_DIR ensure-docker-is-ready -make try-eda NO_KIND=yes NO_LB=yes KPT_SETTERS_FILE=/eda-codespaces/codespaces-4vcpu-kpt-setters.yaml \ No newline at end of file +# Run make with 30s inactivity timeout, retry up to 5 times +run-with-inactivity-timeout 30 5 make try-eda NO_KIND=yes NO_LB=yes KPT_SETTERS_FILE=/eda-codespaces/codespaces-4vcpu-kpt-setters.yaml \ No newline at end of file diff --git a/.devcontainer/utils.sh b/.devcontainer/utils.sh index db3cac8..14ef3bf 100644 --- a/.devcontainer/utils.sh +++ b/.devcontainer/utils.sh @@ -6,4 +6,67 @@ function ensure-docker-is-ready { sleep 1 done echo "Docker is ready" +} + +# Run a command with inactivity timeout - restarts if no output for specified seconds +# Usage: run-with-inactivity-timeout [args...] +function run-with-inactivity-timeout { + local timeout_seconds=$1 + local max_retries=$2 + shift 2 + local cmd=("$@") + local attempt=0 + + while [ $attempt -lt $max_retries ]; do + attempt=$((attempt + 1)) + echo "=== Attempt $attempt/$max_retries: ${cmd[*]} ===" + + # Create a temp file to track last output time + local last_output_file=$(mktemp) + date +%s > "$last_output_file" + + # Run command in background, updating timestamp on each output line + ("${cmd[@]}" 2>&1) | while IFS= read -r line; do + echo "$line" + date +%s > "$last_output_file" + done & + local pipe_pid=$! + + # Monitor for inactivity + while kill -0 $pipe_pid 2>/dev/null; do + sleep 5 + local last_output=$(cat "$last_output_file") + local now=$(date +%s) + local idle_time=$((now - last_output)) + + if [ $idle_time -ge $timeout_seconds ]; then + echo "" + echo "=== No output for ${idle_time}s (timeout: ${timeout_seconds}s). Restarting... ===" + # Kill the pipeline and any child processes + pkill -P $pipe_pid 2>/dev/null + kill $pipe_pid 2>/dev/null + wait $pipe_pid 2>/dev/null + rm -f "$last_output_file" + break + fi + done + + # Check if command completed successfully + if wait $pipe_pid 2>/dev/null; then + rm -f "$last_output_file" + echo "=== Command completed successfully ===" + return 0 + fi + + rm -f "$last_output_file" + + # If we're here due to timeout, continue to next attempt + if [ $attempt -lt $max_retries ]; then + echo "=== Retrying in 5 seconds... ===" + sleep 5 + fi + done + + echo "=== Command failed after $max_retries attempts ===" + return 1 } \ No newline at end of file From f0e51416512497fbdd6f26fc09b0161cd032b734 Mon Sep 17 00:00:00 2001 From: hellt Date: Sat, 10 Jan 2026 13:51:22 +0100 Subject: [PATCH 02/29] use branch image --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 9a4c4a2..be689d2 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Nokia EDA in GitHub Codespaces", - "image": "ghcr.io/eda-labs/codespaces/base:main", + "image": "ghcr.io/eda-labs/codespaces/base:retry-make", "features": { "ghcr.io/devcontainers/features/docker-in-docker:2": { "version": "latest", From d903379fe71f47ccf2a355f8b33374e7a3f78c38 Mon Sep 17 00:00:00 2001 From: hellt Date: Sat, 10 Jan 2026 13:59:15 +0100 Subject: [PATCH 03/29] 60s wait time --- .devcontainer/postCreate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/postCreate.sh b/.devcontainer/postCreate.sh index ad503c7..2669544 100755 --- a/.devcontainer/postCreate.sh +++ b/.devcontainer/postCreate.sh @@ -6,4 +6,4 @@ cd $EDA_PLAYGROUND_DIR ensure-docker-is-ready # Run make with 30s inactivity timeout, retry up to 5 times -run-with-inactivity-timeout 30 5 make try-eda NO_KIND=yes NO_LB=yes KPT_SETTERS_FILE=/eda-codespaces/codespaces-4vcpu-kpt-setters.yaml \ No newline at end of file +run-with-inactivity-timeout 60 5 make try-eda NO_KIND=yes NO_LB=yes KPT_SETTERS_FILE=/eda-codespaces/codespaces-4vcpu-kpt-setters.yaml \ No newline at end of file From f1aa9a28375451d1d2b435362b075421607de4b3 Mon Sep 17 00:00:00 2001 From: hellt Date: Sat, 10 Jan 2026 14:06:22 +0100 Subject: [PATCH 04/29] another counter approach --- .devcontainer/postCreate.sh | 4 +- .devcontainer/utils.sh | 101 +++++++++++++++++++++++------------- 2 files changed, 68 insertions(+), 37 deletions(-) diff --git a/.devcontainer/postCreate.sh b/.devcontainer/postCreate.sh index 2669544..91889af 100755 --- a/.devcontainer/postCreate.sh +++ b/.devcontainer/postCreate.sh @@ -5,5 +5,5 @@ cd $EDA_PLAYGROUND_DIR ensure-docker-is-ready -# Run make with 30s inactivity timeout, retry up to 5 times -run-with-inactivity-timeout 60 5 make try-eda NO_KIND=yes NO_LB=yes KPT_SETTERS_FILE=/eda-codespaces/codespaces-4vcpu-kpt-setters.yaml \ No newline at end of file +# Run make with 90s inactivity timeout, retry up to 5 times +run-with-inactivity-timeout 90 5 make try-eda NO_KIND=yes NO_LB=yes KPT_SETTERS_FILE=/eda-codespaces/codespaces-4vcpu-kpt-setters.yaml \ No newline at end of file diff --git a/.devcontainer/utils.sh b/.devcontainer/utils.sh index 14ef3bf..a3a7fa9 100644 --- a/.devcontainer/utils.sh +++ b/.devcontainer/utils.sh @@ -21,49 +21,80 @@ function run-with-inactivity-timeout { attempt=$((attempt + 1)) echo "=== Attempt $attempt/$max_retries: ${cmd[*]} ===" - # Create a temp file to track last output time - local last_output_file=$(mktemp) - date +%s > "$last_output_file" + # Create a temp file to track last output time (using file modification time) + local marker_file=$(mktemp) - # Run command in background, updating timestamp on each output line - ("${cmd[@]}" 2>&1) | while IFS= read -r line; do - echo "$line" - date +%s > "$last_output_file" - done & - local pipe_pid=$! + # Run command, update marker file on each output line + # Use process substitution to avoid subshell issues + local cmd_pid + "${cmd[@]}" 2>&1 & + cmd_pid=$! - # Monitor for inactivity - while kill -0 $pipe_pid 2>/dev/null; do - sleep 5 - local last_output=$(cat "$last_output_file") - local now=$(date +%s) - local idle_time=$((now - last_output)) - - if [ $idle_time -ge $timeout_seconds ]; then - echo "" - echo "=== No output for ${idle_time}s (timeout: ${timeout_seconds}s). Restarting... ===" - # Kill the pipeline and any child processes - pkill -P $pipe_pid 2>/dev/null - kill $pipe_pid 2>/dev/null - wait $pipe_pid 2>/dev/null - rm -f "$last_output_file" + # Process output in background, touching marker file on each line + { + while IFS= read -r line; do + echo "$line" + touch "$marker_file" + done < <(tail -f /proc/$cmd_pid/fd/1 2>/dev/null || cat /proc/$cmd_pid/fd/1 2>/dev/null) + } 2>/dev/null & + local reader_pid=$! + + # Alternative: simpler approach using a FIFO + kill $reader_pid 2>/dev/null + + # Use a named pipe for reliable output tracking + local fifo=$(mktemp -u) + mkfifo "$fifo" + + # Run command with output to fifo + ("${cmd[@]}" 2>&1; echo "___CMD_DONE___") > "$fifo" & + cmd_pid=$! + + local timed_out=false + local cmd_finished=false + + # Read from fifo with timeout checks + while true; do + # Read with timeout using read -t + if IFS= read -r -t "$timeout_seconds" line < "$fifo"; then + if [ "$line" = "___CMD_DONE___" ]; then + cmd_finished=true + break + fi + echo "$line" + else + # Timeout occurred + timed_out=true break fi done - # Check if command completed successfully - if wait $pipe_pid 2>/dev/null; then - rm -f "$last_output_file" - echo "=== Command completed successfully ===" - return 0 - fi + # Cleanup + rm -f "$fifo" "$marker_file" - rm -f "$last_output_file" + if [ "$cmd_finished" = true ]; then + # Wait for command and check exit status + if wait $cmd_pid 2>/dev/null; then + echo "=== Command completed successfully ===" + return 0 + else + echo "=== Command failed with non-zero exit ===" + return 1 + fi + fi - # If we're here due to timeout, continue to next attempt - if [ $attempt -lt $max_retries ]; then - echo "=== Retrying in 5 seconds... ===" - sleep 5 + if [ "$timed_out" = true ]; then + echo "" + echo "=== No output for ${timeout_seconds}s. Restarting... ===" + # Kill the command and all its children + pkill -P $cmd_pid 2>/dev/null + kill $cmd_pid 2>/dev/null + wait $cmd_pid 2>/dev/null + + if [ $attempt -lt $max_retries ]; then + echo "=== Retrying in 5 seconds... ===" + sleep 5 + fi fi done From 2ff7eb3e7316a004cca3c145cbe047f0b39d7c5c Mon Sep 17 00:00:00 2001 From: hellt Date: Sat, 10 Jan 2026 14:22:09 +0100 Subject: [PATCH 05/29] vibing the watcher script --- .devcontainer/utils.sh | 101 ++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 57 deletions(-) diff --git a/.devcontainer/utils.sh b/.devcontainer/utils.sh index a3a7fa9..a74b1cf 100644 --- a/.devcontainer/utils.sh +++ b/.devcontainer/utils.sh @@ -21,80 +21,67 @@ function run-with-inactivity-timeout { attempt=$((attempt + 1)) echo "=== Attempt $attempt/$max_retries: ${cmd[*]} ===" - # Create a temp file to track last output time (using file modification time) + # Create marker file - we'll use its modification time local marker_file=$(mktemp) + touch "$marker_file" - # Run command, update marker file on each output line - # Use process substitution to avoid subshell issues - local cmd_pid - "${cmd[@]}" 2>&1 & - cmd_pid=$! - - # Process output in background, touching marker file on each line - { - while IFS= read -r line; do - echo "$line" - touch "$marker_file" - done < <(tail -f /proc/$cmd_pid/fd/1 2>/dev/null || cat /proc/$cmd_pid/fd/1 2>/dev/null) - } 2>/dev/null & - local reader_pid=$! - - # Alternative: simpler approach using a FIFO - kill $reader_pid 2>/dev/null - - # Use a named pipe for reliable output tracking - local fifo=$(mktemp -u) - mkfifo "$fifo" - - # Run command with output to fifo - ("${cmd[@]}" 2>&1; echo "___CMD_DONE___") > "$fifo" & - cmd_pid=$! + # Start the command, piping through a while loop that touches the marker + # Using stdbuf to disable buffering + stdbuf -oL -eL "${cmd[@]}" 2>&1 | while IFS= read -r line; do + echo "$line" + touch "$marker_file" + done & + local pipe_pid=$! local timed_out=false - local cmd_finished=false - # Read from fifo with timeout checks - while true; do - # Read with timeout using read -t - if IFS= read -r -t "$timeout_seconds" line < "$fifo"; then - if [ "$line" = "___CMD_DONE___" ]; then - cmd_finished=true - break - fi - echo "$line" - else - # Timeout occurred + # Monitor loop - check marker file modification time + while kill -0 $pipe_pid 2>/dev/null; do + sleep 5 + + # Get seconds since marker was last modified + local now=$(date +%s) + local last_mod=$(stat -c %Y "$marker_file" 2>/dev/null || echo "$now") + local idle_time=$((now - last_mod)) + + if [ $idle_time -ge $timeout_seconds ]; then timed_out=true + echo "" + echo "=== No output for ${idle_time}s (timeout: ${timeout_seconds}s). Restarting... ===" + + # Kill the entire process group + kill -- -$pipe_pid 2>/dev/null || true + # Kill by parent + pkill -P $pipe_pid 2>/dev/null || true + # Direct kill + kill $pipe_pid 2>/dev/null || true + # Kill any remaining make/kpt processes from this session + pkill -f "kpt live apply" 2>/dev/null || true + + sleep 2 break fi done - # Cleanup - rm -f "$fifo" "$marker_file" + wait $pipe_pid 2>/dev/null + local exit_code=$? + + rm -f "$marker_file" - if [ "$cmd_finished" = true ]; then - # Wait for command and check exit status - if wait $cmd_pid 2>/dev/null; then + if [ "$timed_out" = false ]; then + if [ $exit_code -eq 0 ]; then echo "=== Command completed successfully ===" return 0 else - echo "=== Command failed with non-zero exit ===" - return 1 + echo "=== Command failed with exit code $exit_code ===" + return $exit_code fi fi - if [ "$timed_out" = true ]; then - echo "" - echo "=== No output for ${timeout_seconds}s. Restarting... ===" - # Kill the command and all its children - pkill -P $cmd_pid 2>/dev/null - kill $cmd_pid 2>/dev/null - wait $cmd_pid 2>/dev/null - - if [ $attempt -lt $max_retries ]; then - echo "=== Retrying in 5 seconds... ===" - sleep 5 - fi + # Timed out - retry + if [ $attempt -lt $max_retries ]; then + echo "=== Retrying in 5 seconds... ===" + sleep 5 fi done From 1756729fe813be07bfd2590d2d2f4fc130fca5b3 Mon Sep 17 00:00:00 2001 From: hellt Date: Sat, 10 Jan 2026 14:45:27 +0100 Subject: [PATCH 06/29] 180s wait --- .devcontainer/postCreate.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.devcontainer/postCreate.sh b/.devcontainer/postCreate.sh index 91889af..d1747d8 100755 --- a/.devcontainer/postCreate.sh +++ b/.devcontainer/postCreate.sh @@ -5,5 +5,5 @@ cd $EDA_PLAYGROUND_DIR ensure-docker-is-ready -# Run make with 90s inactivity timeout, retry up to 5 times -run-with-inactivity-timeout 90 5 make try-eda NO_KIND=yes NO_LB=yes KPT_SETTERS_FILE=/eda-codespaces/codespaces-4vcpu-kpt-setters.yaml \ No newline at end of file +# Run make with 180s inactivity timeout, retry up to 3 times +run-with-inactivity-timeout 180 3 make try-eda NO_KIND=yes NO_LB=yes KPT_SETTERS_FILE=/eda-codespaces/codespaces-4vcpu-kpt-setters.yaml \ No newline at end of file From 3d9464ca8aa2499ad4face1c323feac2b4c96ea8 Mon Sep 17 00:00:00 2001 From: hellt Date: Sat, 10 Jan 2026 15:21:40 +0100 Subject: [PATCH 07/29] trying more proper font setting --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index be689d2..89925d3 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -20,7 +20,7 @@ "path": "/bin/zsh" } }, - "terminal.integrated.fontFamily": "'JetBrainsMono Nerd Font', 'JetBrainsMono NF', monospace", + "terminal.integrated.fontFamily": "JetBrainsMono Nerd Font, JetBrainsMono, JetBrains Mono, Fira Code Nerd Font, FiraCode Nerd Font, Fira Code, Hasklig, Menlo, Monaco, 'Courier New', monospace", "vscode-eda.edaTargets": { "https://127.0.0.1:9443": { "edaUsername": "admin", From 038334fc0dec14805122f647cd322836d9b10957 Mon Sep 17 00:00:00 2001 From: Kaelem Chandra Date: Sat, 10 Jan 2026 22:29:08 +0800 Subject: [PATCH 08/29] Use correct img, try without timeout wrapper --- .devcontainer/devcontainer.json | 2 +- .devcontainer/postCreate.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 89925d3..fcb2092 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Nokia EDA in GitHub Codespaces", - "image": "ghcr.io/eda-labs/codespaces/base:retry-make", + "image": "ghcr.io/eda-labs/codespaces/base:kaelem-test", "features": { "ghcr.io/devcontainers/features/docker-in-docker:2": { "version": "latest", diff --git a/.devcontainer/postCreate.sh b/.devcontainer/postCreate.sh index d1747d8..bcb580f 100755 --- a/.devcontainer/postCreate.sh +++ b/.devcontainer/postCreate.sh @@ -6,4 +6,4 @@ cd $EDA_PLAYGROUND_DIR ensure-docker-is-ready # Run make with 180s inactivity timeout, retry up to 3 times -run-with-inactivity-timeout 180 3 make try-eda NO_KIND=yes NO_LB=yes KPT_SETTERS_FILE=/eda-codespaces/codespaces-4vcpu-kpt-setters.yaml \ No newline at end of file +make try-eda NO_KIND=yes NO_LB=yes KPT_SETTERS_FILE=/eda-codespaces/codespaces-4vcpu-kpt-setters.yaml \ No newline at end of file From 4dc99254ce337cd3b5fc1bc8213c95f0f70f60a7 Mon Sep 17 00:00:00 2001 From: Kaelem Chandra Date: Sat, 10 Jan 2026 23:23:37 +0800 Subject: [PATCH 09/29] Use kaelem testing args --- .devcontainer/postCreate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/postCreate.sh b/.devcontainer/postCreate.sh index bcb580f..d3a085f 100755 --- a/.devcontainer/postCreate.sh +++ b/.devcontainer/postCreate.sh @@ -6,4 +6,4 @@ cd $EDA_PLAYGROUND_DIR ensure-docker-is-ready # Run make with 180s inactivity timeout, retry up to 3 times -make try-eda NO_KIND=yes NO_LB=yes KPT_SETTERS_FILE=/eda-codespaces/codespaces-4vcpu-kpt-setters.yaml \ No newline at end of file +make try-eda NO_KIND=yes NO_LB=yes KPT_SETTERS_FILE=/eda-codespaces/codespaces-4vcpu-kpt-setters.yaml KAELEM=true \ No newline at end of file From e383971dacc007a8fa3c6c4cb1d2a2a74de8f643 Mon Sep 17 00:00:00 2001 From: Kaelem Chandra Date: Sat, 10 Jan 2026 23:41:24 +0800 Subject: [PATCH 10/29] force rerun --- .devcontainer/postCreate.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.devcontainer/postCreate.sh b/.devcontainer/postCreate.sh index d3a085f..8fc6e1d 100755 --- a/.devcontainer/postCreate.sh +++ b/.devcontainer/postCreate.sh @@ -5,5 +5,4 @@ cd $EDA_PLAYGROUND_DIR ensure-docker-is-ready -# Run make with 180s inactivity timeout, retry up to 3 times make try-eda NO_KIND=yes NO_LB=yes KPT_SETTERS_FILE=/eda-codespaces/codespaces-4vcpu-kpt-setters.yaml KAELEM=true \ No newline at end of file From dfe57b06b647847370d892e18978ec30ceb9bf0f Mon Sep 17 00:00:00 2001 From: Kaelem Chandra Date: Sun, 11 Jan 2026 00:18:59 +0800 Subject: [PATCH 11/29] Try a make override --- .devcontainer/overrides.mk | 27 +++++++++++++++++++++++++++ .devcontainer/postCreate.sh | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 .devcontainer/overrides.mk diff --git a/.devcontainer/overrides.mk b/.devcontainer/overrides.mk new file mode 100644 index 0000000..d46c188 --- /dev/null +++ b/.devcontainer/overrides.mk @@ -0,0 +1,27 @@ +KPT_RETRY ?= 3 + +define INSTALL_KPT_PACKAGE + { \ + echo -e "--> INSTALL: [\033[1;34m$2\033[0m] - Applying kpt package" ;\ + pushd $1 &>/dev/null || (echo "[ERROR]: Failed to switch cwd to $2" && exit 1) ;\ + if [[ ! -f resourcegroup.yaml ]] || [[ $(KPT_LIVE_INIT_FORCE) -eq 1 ]]; then \ + $(KPT) live init --force 2>&1 | $(INDENT_OUT) ;\ + else \ + echo -e "--> INSTALL: [\033[1;34m$2\033[0m] - Resource group found, don't re-init this package" ;\ + fi ;\ + for attempt in $$(seq 1 $(KPT_RETRY)); do \ + echo -e "--> INSTALL: [\033[1;34m$2\033[0m] - Attempt $$attempt/$(KPT_RETRY)" ;\ + if $(KPT) live apply $(KPT_LIVE_APPLY_ARGS) 2>&1 | $(INDENT_OUT); then \ + break ;\ + fi ;\ + if [[ $$attempt -eq $(KPT_RETRY) ]]; then \ + echo -e "--> INSTALL: [\033[1;31m$2\033[0m] - Failed after $(KPT_RETRY) attempts" ;\ + exit 1 ;\ + fi ;\ + echo -e "--> INSTALL: [\033[1;33m$2\033[0m] - Attempt $$attempt failed, retrying..." ;\ + sleep 2 ;\ + done ;\ + popd &>/dev/null || (echo "[ERROR]: Failed to switch back from $2" && exit 1) ;\ + echo -e "--> INSTALL: [\033[0;32m$2\033[0m] - Applied and reconciled package" ;\ + } +endef diff --git a/.devcontainer/postCreate.sh b/.devcontainer/postCreate.sh index 8fc6e1d..da02b05 100755 --- a/.devcontainer/postCreate.sh +++ b/.devcontainer/postCreate.sh @@ -5,4 +5,4 @@ cd $EDA_PLAYGROUND_DIR ensure-docker-is-ready -make try-eda NO_KIND=yes NO_LB=yes KPT_SETTERS_FILE=/eda-codespaces/codespaces-4vcpu-kpt-setters.yaml KAELEM=true \ No newline at end of file +make -f Makefile -f /workspaces/codespaces/.devcontainer/overrides.mk try-eda NO_KIND=yes NO_LB=yes KPT_SETTERS_FILE=/eda-codespaces/codespaces-4vcpu-kpt-setters.yaml \ No newline at end of file From fe222f5a275abb62f6cfa5688746badbd0102c7d Mon Sep 17 00:00:00 2001 From: Kaelem Chandra Date: Sun, 11 Jan 2026 00:20:13 +0800 Subject: [PATCH 12/29] rebuild --- .devcontainer/onCreate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/onCreate.sh b/.devcontainer/onCreate.sh index 1b83790..396f11c 100755 --- a/.devcontainer/onCreate.sh +++ b/.devcontainer/onCreate.sh @@ -6,7 +6,7 @@ free -m sudo sysctl -w fs.inotify.max_user_watches=1048576 sudo sysctl -w fs.inotify.max_user_instances=512 - +# xyz TOKEN=$($EDA_PLAYGROUND_DIR/tools/yq -o=json '.assets.registries[].auth' $HOME/.bundle.yaml | jq -r '(reduce range(.extraEncodeCount + 1) as $_ (.username; @base64d)) + ":" + (reduce range(.extraEncodeCount + 1) as $_ (.password; @base64d))') ensure-docker-is-ready From deb25d750f74dc6759c7ae2e0670ab99c0dca678 Mon Sep 17 00:00:00 2001 From: Kaelem Chandra Date: Sun, 11 Jan 2026 00:44:40 +0800 Subject: [PATCH 13/29] Bump retry count, and add the reconcile timeout (3mins) --- .devcontainer/overrides.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.devcontainer/overrides.mk b/.devcontainer/overrides.mk index d46c188..2e1ebc8 100644 --- a/.devcontainer/overrides.mk +++ b/.devcontainer/overrides.mk @@ -1,4 +1,5 @@ -KPT_RETRY ?= 3 +KPT_RETRY ?= 5 +KPT_LIVE_APPLY_ARGS += --reconcile-timeout=3m define INSTALL_KPT_PACKAGE { \ From ded45b17ff5cd25f3821a5ca5a16514924ca1a46 Mon Sep 17 00:00:00 2001 From: Kaelem Chandra Date: Sun, 11 Jan 2026 01:00:40 +0800 Subject: [PATCH 14/29] Disable default AI thingy --- .devcontainer/devcontainer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index fcb2092..9d97768 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -14,6 +14,7 @@ "eda-labs.vscode-eda" ], "settings": { + "chat.disableAIFeatures": true, "terminal.integrated.defaultProfile.linux": "zsh", "terminal.integrated.profiles.linux": { "zsh": { From dcdc0b02d111940953e5969d5189069be738c8f0 Mon Sep 17 00:00:00 2001 From: Kaelem Chandra Date: Sun, 11 Jan 2026 01:15:02 +0800 Subject: [PATCH 15/29] gone but not forgotten --- .devcontainer/utils.sh | 81 ------------------------------------------ 1 file changed, 81 deletions(-) diff --git a/.devcontainer/utils.sh b/.devcontainer/utils.sh index a74b1cf..db3cac8 100644 --- a/.devcontainer/utils.sh +++ b/.devcontainer/utils.sh @@ -6,85 +6,4 @@ function ensure-docker-is-ready { sleep 1 done echo "Docker is ready" -} - -# Run a command with inactivity timeout - restarts if no output for specified seconds -# Usage: run-with-inactivity-timeout [args...] -function run-with-inactivity-timeout { - local timeout_seconds=$1 - local max_retries=$2 - shift 2 - local cmd=("$@") - local attempt=0 - - while [ $attempt -lt $max_retries ]; do - attempt=$((attempt + 1)) - echo "=== Attempt $attempt/$max_retries: ${cmd[*]} ===" - - # Create marker file - we'll use its modification time - local marker_file=$(mktemp) - touch "$marker_file" - - # Start the command, piping through a while loop that touches the marker - # Using stdbuf to disable buffering - stdbuf -oL -eL "${cmd[@]}" 2>&1 | while IFS= read -r line; do - echo "$line" - touch "$marker_file" - done & - local pipe_pid=$! - - local timed_out=false - - # Monitor loop - check marker file modification time - while kill -0 $pipe_pid 2>/dev/null; do - sleep 5 - - # Get seconds since marker was last modified - local now=$(date +%s) - local last_mod=$(stat -c %Y "$marker_file" 2>/dev/null || echo "$now") - local idle_time=$((now - last_mod)) - - if [ $idle_time -ge $timeout_seconds ]; then - timed_out=true - echo "" - echo "=== No output for ${idle_time}s (timeout: ${timeout_seconds}s). Restarting... ===" - - # Kill the entire process group - kill -- -$pipe_pid 2>/dev/null || true - # Kill by parent - pkill -P $pipe_pid 2>/dev/null || true - # Direct kill - kill $pipe_pid 2>/dev/null || true - # Kill any remaining make/kpt processes from this session - pkill -f "kpt live apply" 2>/dev/null || true - - sleep 2 - break - fi - done - - wait $pipe_pid 2>/dev/null - local exit_code=$? - - rm -f "$marker_file" - - if [ "$timed_out" = false ]; then - if [ $exit_code -eq 0 ]; then - echo "=== Command completed successfully ===" - return 0 - else - echo "=== Command failed with exit code $exit_code ===" - return $exit_code - fi - fi - - # Timed out - retry - if [ $attempt -lt $max_retries ]; then - echo "=== Retrying in 5 seconds... ===" - sleep 5 - fi - done - - echo "=== Command failed after $max_retries attempts ===" - return 1 } \ No newline at end of file From 93dffbd4a68ab1e8754f61185e8381750fc9454d Mon Sep 17 00:00:00 2001 From: Kaelem Chandra Date: Sun, 11 Jan 2026 01:33:27 +0800 Subject: [PATCH 16/29] Centralise env vars -> devc json, and try-eda params -> overrides --- .devcontainer/devcontainer.json | 4 +++- .devcontainer/onCreate.sh | 2 +- .devcontainer/overrides.mk | 9 +++++++++ .devcontainer/postCreate.sh | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 9d97768..38b44a7 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -40,7 +40,9 @@ "postCreateCommand": ".devcontainer/postCreate.sh", "postAttachCommand": ".devcontainer/postAttach.sh", "containerEnv": { - "EDA_PORT": "9443" + "EDA_PORT": "9443", + "TRY_EDA_OVERRIDES_FILE_PATH": "/workspaces/codespaces/.devcontainer/overrides.mk", + "NUM_CONCURRENT_IMG_PREPULLS": "8" }, "forwardPorts": [ 9443 diff --git a/.devcontainer/onCreate.sh b/.devcontainer/onCreate.sh index 396f11c..4cb2172 100755 --- a/.devcontainer/onCreate.sh +++ b/.devcontainer/onCreate.sh @@ -18,4 +18,4 @@ k3d cluster create eda-demo \ --volume "$HOME/.images.txt:/opt/images.txt@server:*" \ --no-lb -docker exec -d k3d-eda-demo-server-0 sh -c "cat /opt/images.txt | xargs -P 4 -I {} crictl pull --creds $TOKEN {}" \ No newline at end of file +docker exec -d k3d-eda-demo-server-0 sh -c "cat /opt/images.txt | xargs -P $NUM_CONCURRENT_IMG_PREPULLS -I {} crictl pull --creds $TOKEN {}" \ No newline at end of file diff --git a/.devcontainer/overrides.mk b/.devcontainer/overrides.mk index 2e1ebc8..80f4452 100644 --- a/.devcontainer/overrides.mk +++ b/.devcontainer/overrides.mk @@ -1,6 +1,15 @@ +NO_KIND = yes +NO_LB = yes +KPT_SETTERS_FILE = /eda-codespaces/codespaces-4vcpu-kpt-setters.yaml + KPT_RETRY ?= 5 KPT_LIVE_APPLY_ARGS += --reconcile-timeout=3m +# Override the INSTALL_KPT_PACKAGE macro +# +# Set the --reconcile-timeout flag so that KPT doesn't just hang for a while +# then the updated macro below, will handle the exit by retrying the kpt live apply +# until we hit the retry limit. define INSTALL_KPT_PACKAGE { \ echo -e "--> INSTALL: [\033[1;34m$2\033[0m] - Applying kpt package" ;\ diff --git a/.devcontainer/postCreate.sh b/.devcontainer/postCreate.sh index da02b05..0e06ea3 100755 --- a/.devcontainer/postCreate.sh +++ b/.devcontainer/postCreate.sh @@ -5,4 +5,4 @@ cd $EDA_PLAYGROUND_DIR ensure-docker-is-ready -make -f Makefile -f /workspaces/codespaces/.devcontainer/overrides.mk try-eda NO_KIND=yes NO_LB=yes KPT_SETTERS_FILE=/eda-codespaces/codespaces-4vcpu-kpt-setters.yaml \ No newline at end of file +make -f Makefile -f $TRY_EDA_OVERRIDES_FILE_PATH try-eda \ No newline at end of file From be9f27d14ca888283bad12d98486e57b4e14d4e3 Mon Sep 17 00:00:00 2001 From: Kaelem Chandra Date: Sun, 11 Jan 2026 02:03:09 +0800 Subject: [PATCH 17/29] Not everything can live in the overrides.mk seemingly --- .devcontainer/devcontainer.json | 3 ++- .devcontainer/overrides.mk | 4 ---- .devcontainer/postCreate.sh | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 38b44a7..4d242a4 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -41,7 +41,8 @@ "postAttachCommand": ".devcontainer/postAttach.sh", "containerEnv": { "EDA_PORT": "9443", - "TRY_EDA_OVERRIDES_FILE_PATH": "/workspaces/codespaces/.devcontainer/overrides.mk", + "TRY_EDA_OVERRIDES_FILE": "/workspaces/codespaces/.devcontainer/overrides.mk", + "TRY_EDA_KPT_SETTERS_FILE": "/eda-codespaces/codespaces-4vcpu-kpt-setters.yaml", "NUM_CONCURRENT_IMG_PREPULLS": "8" }, "forwardPorts": [ diff --git a/.devcontainer/overrides.mk b/.devcontainer/overrides.mk index 80f4452..e3d01cf 100644 --- a/.devcontainer/overrides.mk +++ b/.devcontainer/overrides.mk @@ -1,7 +1,3 @@ -NO_KIND = yes -NO_LB = yes -KPT_SETTERS_FILE = /eda-codespaces/codespaces-4vcpu-kpt-setters.yaml - KPT_RETRY ?= 5 KPT_LIVE_APPLY_ARGS += --reconcile-timeout=3m diff --git a/.devcontainer/postCreate.sh b/.devcontainer/postCreate.sh index 0e06ea3..427910f 100755 --- a/.devcontainer/postCreate.sh +++ b/.devcontainer/postCreate.sh @@ -5,4 +5,4 @@ cd $EDA_PLAYGROUND_DIR ensure-docker-is-ready -make -f Makefile -f $TRY_EDA_OVERRIDES_FILE_PATH try-eda \ No newline at end of file +make -f Makefile -f /workspaces/codespaces/.devcontainer/overrides.mk try-eda NO_KIND=yes NO_LB=yes KPT_SETTERS_FILE=$TRY_EDA_KPT_SETTERS_FILE \ No newline at end of file From 8ce404a5ccafab5a772d37f1cc7327f399bd9a2f Mon Sep 17 00:00:00 2001 From: hellt Date: Sat, 10 Jan 2026 20:15:37 +0100 Subject: [PATCH 18/29] another font attempt --- .devcontainer/devcontainer.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 4d242a4..27ce73a 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -10,7 +10,8 @@ "customizations": { "vscode": { "extensions": [ - // "ms-kubernetes-tools.vscode-kubernetes-tools", + "entuent.fira-code-nerd-font", + "ms-kubernetes-tools.vscode-kubernetes-tools", "eda-labs.vscode-eda" ], "settings": { @@ -21,7 +22,7 @@ "path": "/bin/zsh" } }, - "terminal.integrated.fontFamily": "JetBrainsMono Nerd Font, JetBrainsMono, JetBrains Mono, Fira Code Nerd Font, FiraCode Nerd Font, Fira Code, Hasklig, Menlo, Monaco, 'Courier New', monospace", + "terminal.integrated.fontFamily": "JetBrainsMono Nerd Font, JetBrainsMono, JetBrains Mono, fira-code-nerd, Fira Code Nerd Font, FiraCode Nerd Font, Fira Code, Consolas, Hasklig, Menlo, Monaco, 'Courier New', monospace", "vscode-eda.edaTargets": { "https://127.0.0.1:9443": { "edaUsername": "admin", From bd9b9dde5cdd89ff2b625bcd0aa6df5b0aa5a7e4 Mon Sep 17 00:00:00 2001 From: hellt Date: Sat, 10 Jan 2026 21:24:03 +0100 Subject: [PATCH 19/29] fg image pull --- .devcontainer/onCreate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/onCreate.sh b/.devcontainer/onCreate.sh index 4cb2172..4124680 100755 --- a/.devcontainer/onCreate.sh +++ b/.devcontainer/onCreate.sh @@ -18,4 +18,4 @@ k3d cluster create eda-demo \ --volume "$HOME/.images.txt:/opt/images.txt@server:*" \ --no-lb -docker exec -d k3d-eda-demo-server-0 sh -c "cat /opt/images.txt | xargs -P $NUM_CONCURRENT_IMG_PREPULLS -I {} crictl pull --creds $TOKEN {}" \ No newline at end of file +docker exec k3d-eda-demo-server-0 sh -c "cat /opt/images.txt | xargs -P $NUM_CONCURRENT_IMG_PREPULLS -I {} crictl pull --creds $TOKEN {}" \ No newline at end of file From 3d1267e20f184214268fab6cbe4372c68657ea8b Mon Sep 17 00:00:00 2001 From: hellt Date: Sat, 10 Jan 2026 21:24:56 +0100 Subject: [PATCH 20/29] pull in post create --- .devcontainer/onCreate.sh | 2 -- .devcontainer/postCreate.sh | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.devcontainer/onCreate.sh b/.devcontainer/onCreate.sh index 4124680..7b4400b 100755 --- a/.devcontainer/onCreate.sh +++ b/.devcontainer/onCreate.sh @@ -17,5 +17,3 @@ k3d cluster create eda-demo \ --k3s-arg "--disable=servicelb@server:*" \ --volume "$HOME/.images.txt:/opt/images.txt@server:*" \ --no-lb - -docker exec k3d-eda-demo-server-0 sh -c "cat /opt/images.txt | xargs -P $NUM_CONCURRENT_IMG_PREPULLS -I {} crictl pull --creds $TOKEN {}" \ No newline at end of file diff --git a/.devcontainer/postCreate.sh b/.devcontainer/postCreate.sh index 427910f..b9c0bca 100755 --- a/.devcontainer/postCreate.sh +++ b/.devcontainer/postCreate.sh @@ -5,4 +5,6 @@ cd $EDA_PLAYGROUND_DIR ensure-docker-is-ready +docker exec k3d-eda-demo-server-0 sh -c "cat /opt/images.txt | xargs -P $NUM_CONCURRENT_IMG_PREPULLS -I {} crictl pull --creds $TOKEN {}" + make -f Makefile -f /workspaces/codespaces/.devcontainer/overrides.mk try-eda NO_KIND=yes NO_LB=yes KPT_SETTERS_FILE=$TRY_EDA_KPT_SETTERS_FILE \ No newline at end of file From 32de4477a42b2523a9818027e3b425b33a65dd0d Mon Sep 17 00:00:00 2001 From: hellt Date: Sat, 10 Jan 2026 21:34:07 +0100 Subject: [PATCH 21/29] fix path for images --- .devcontainer/postCreate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/postCreate.sh b/.devcontainer/postCreate.sh index b9c0bca..86193ee 100755 --- a/.devcontainer/postCreate.sh +++ b/.devcontainer/postCreate.sh @@ -5,6 +5,6 @@ cd $EDA_PLAYGROUND_DIR ensure-docker-is-ready -docker exec k3d-eda-demo-server-0 sh -c "cat /opt/images.txt | xargs -P $NUM_CONCURRENT_IMG_PREPULLS -I {} crictl pull --creds $TOKEN {}" +docker exec k3d-eda-demo-server-0 sh -c "cat /home/vscode/images.txt | xargs -P $NUM_CONCURRENT_IMG_PREPULLS -I {} crictl pull --creds $TOKEN {}" make -f Makefile -f /workspaces/codespaces/.devcontainer/overrides.mk try-eda NO_KIND=yes NO_LB=yes KPT_SETTERS_FILE=$TRY_EDA_KPT_SETTERS_FILE \ No newline at end of file From d8e71856550d8f9095779970c8a4d67079ad7a98 Mon Sep 17 00:00:00 2001 From: hellt Date: Sat, 10 Jan 2026 21:40:32 +0100 Subject: [PATCH 22/29] pull in create --- .devcontainer/onCreate.sh | 2 ++ .devcontainer/postCreate.sh | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.devcontainer/onCreate.sh b/.devcontainer/onCreate.sh index 7b4400b..4124680 100755 --- a/.devcontainer/onCreate.sh +++ b/.devcontainer/onCreate.sh @@ -17,3 +17,5 @@ k3d cluster create eda-demo \ --k3s-arg "--disable=servicelb@server:*" \ --volume "$HOME/.images.txt:/opt/images.txt@server:*" \ --no-lb + +docker exec k3d-eda-demo-server-0 sh -c "cat /opt/images.txt | xargs -P $NUM_CONCURRENT_IMG_PREPULLS -I {} crictl pull --creds $TOKEN {}" \ No newline at end of file diff --git a/.devcontainer/postCreate.sh b/.devcontainer/postCreate.sh index 86193ee..427910f 100755 --- a/.devcontainer/postCreate.sh +++ b/.devcontainer/postCreate.sh @@ -5,6 +5,4 @@ cd $EDA_PLAYGROUND_DIR ensure-docker-is-ready -docker exec k3d-eda-demo-server-0 sh -c "cat /home/vscode/images.txt | xargs -P $NUM_CONCURRENT_IMG_PREPULLS -I {} crictl pull --creds $TOKEN {}" - make -f Makefile -f /workspaces/codespaces/.devcontainer/overrides.mk try-eda NO_KIND=yes NO_LB=yes KPT_SETTERS_FILE=$TRY_EDA_KPT_SETTERS_FILE \ No newline at end of file From 5733a9a87abb7dc79a43649e4be8927f129e9215 Mon Sep 17 00:00:00 2001 From: Kaelem Chandra Date: Sun, 11 Jan 2026 04:50:04 +0800 Subject: [PATCH 23/29] Lower concurrent prepulls back to 4 --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 27ce73a..978419b 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -44,7 +44,7 @@ "EDA_PORT": "9443", "TRY_EDA_OVERRIDES_FILE": "/workspaces/codespaces/.devcontainer/overrides.mk", "TRY_EDA_KPT_SETTERS_FILE": "/eda-codespaces/codespaces-4vcpu-kpt-setters.yaml", - "NUM_CONCURRENT_IMG_PREPULLS": "8" + "NUM_CONCURRENT_IMG_PREPULLS": "4" }, "forwardPorts": [ 9443 From 47539e0d4b95c5909c8299570dbe962cfa6dbe5e Mon Sep 17 00:00:00 2001 From: hellt Date: Sat, 10 Jan 2026 21:51:29 +0100 Subject: [PATCH 24/29] pull in post create for process visibility --- .devcontainer/onCreate.sh | 4 ---- .devcontainer/postCreate.sh | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.devcontainer/onCreate.sh b/.devcontainer/onCreate.sh index 4124680..de91b6d 100755 --- a/.devcontainer/onCreate.sh +++ b/.devcontainer/onCreate.sh @@ -6,8 +6,6 @@ free -m sudo sysctl -w fs.inotify.max_user_watches=1048576 sudo sysctl -w fs.inotify.max_user_instances=512 -# xyz -TOKEN=$($EDA_PLAYGROUND_DIR/tools/yq -o=json '.assets.registries[].auth' $HOME/.bundle.yaml | jq -r '(reduce range(.extraEncodeCount + 1) as $_ (.username; @base64d)) + ":" + (reduce range(.extraEncodeCount + 1) as $_ (.password; @base64d))') ensure-docker-is-ready @@ -17,5 +15,3 @@ k3d cluster create eda-demo \ --k3s-arg "--disable=servicelb@server:*" \ --volume "$HOME/.images.txt:/opt/images.txt@server:*" \ --no-lb - -docker exec k3d-eda-demo-server-0 sh -c "cat /opt/images.txt | xargs -P $NUM_CONCURRENT_IMG_PREPULLS -I {} crictl pull --creds $TOKEN {}" \ No newline at end of file diff --git a/.devcontainer/postCreate.sh b/.devcontainer/postCreate.sh index 427910f..75e367b 100755 --- a/.devcontainer/postCreate.sh +++ b/.devcontainer/postCreate.sh @@ -5,4 +5,8 @@ cd $EDA_PLAYGROUND_DIR ensure-docker-is-ready + +TOKEN=$($EDA_PLAYGROUND_DIR/tools/yq -o=json '.assets.registries[].auth' $HOME/.bundle.yaml | jq -r '(reduce range(.extraEncodeCount + 1) as $_ (.username; @base64d)) + ":" + (reduce range(.extraEncodeCount + 1) as $_ (.password; @base64d))') +docker exec k3d-eda-demo-server-0 sh -c "cat /opt/images.txt | xargs -P $NUM_CONCURRENT_IMG_PREPULLS -I {} crictl pull --creds $TOKEN {}" + make -f Makefile -f /workspaces/codespaces/.devcontainer/overrides.mk try-eda NO_KIND=yes NO_LB=yes KPT_SETTERS_FILE=$TRY_EDA_KPT_SETTERS_FILE \ No newline at end of file From 2f70cc3fc66f77bc61f4247fe17fd2e051eb1ce8 Mon Sep 17 00:00:00 2001 From: hellt Date: Sat, 10 Jan 2026 23:23:53 +0100 Subject: [PATCH 25/29] try 8 concurrent pulls --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 978419b..27ce73a 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -44,7 +44,7 @@ "EDA_PORT": "9443", "TRY_EDA_OVERRIDES_FILE": "/workspaces/codespaces/.devcontainer/overrides.mk", "TRY_EDA_KPT_SETTERS_FILE": "/eda-codespaces/codespaces-4vcpu-kpt-setters.yaml", - "NUM_CONCURRENT_IMG_PREPULLS": "4" + "NUM_CONCURRENT_IMG_PREPULLS": "8" }, "forwardPorts": [ 9443 From 342d698e7a5a7e592c634e741053bbbbaecfe89a Mon Sep 17 00:00:00 2001 From: hellt Date: Sat, 10 Jan 2026 23:24:07 +0100 Subject: [PATCH 26/29] remove icons from the prompt --- .devcontainer/shell/starship.toml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.devcontainer/shell/starship.toml b/.devcontainer/shell/starship.toml index af918b0..9bfd270 100644 --- a/.devcontainer/shell/starship.toml +++ b/.devcontainer/shell/starship.toml @@ -1,39 +1,29 @@ # Get editor completions based on the config schema "$schema" = 'https://starship.rs/config-schema.json' - # Inserts a blank line between shell prompts add_newline = true [git_branch] -symbol = " " format = '· [$symbol$branch(:$remote_branch)]($style) ' [git_commit] tag_disabled = false -tag_symbol = "  " [golang] -symbol = ' ' format = '· [$symbol($version )]($style)' [package] format = '· [$symbol$version]($style) ' -symbol = "󰏗 " [python] format = '· [${symbol}${pyenv_prefix}(${version} )(\($virtualenv\) )]($style)' -symbol = " " [kubernetes] -disabled = false -symbol = "󱃾 " +disabled = true [container] disabled = true [direnv] disabled = true - -[hostname] -ssh_symbol = " " \ No newline at end of file From 626efe46041cc9b67e983ea2cf1aa940df222583 Mon Sep 17 00:00:00 2001 From: hellt Date: Sun, 11 Jan 2026 00:00:08 +0100 Subject: [PATCH 27/29] pin playground tag --- .devcontainer/Dockerfile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index cdcccae..107114a 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -41,10 +41,7 @@ RUN echo 'export PATH="$PATH:$EDA_PLAYGROUND_DIR/tools"' >> /etc/zsh/zshrc USER vscode -# patching kpt version to beta59 to see if it is better in handling sporadic k8s -# issues in GH codespaces where beta57 is stuck in reading the reconciled resources. -RUN git clone --depth 1 "https://github.com/$EDA_PLAYGROUND_REPO" $EDA_PLAYGROUND_DIR && cd $EDA_PLAYGROUND_DIR && \ - sed -i 's/KPT_VERSION ?= v1.0.0-beta.57/KPT_VERSION ?= v1.0.0-beta.59/' Makefile && \ +RUN git clone --depth 1 --name v0.0.1 "https://github.com/$EDA_PLAYGROUND_REPO" $EDA_PLAYGROUND_DIR && cd $EDA_PLAYGROUND_DIR && \ make download-tools RUN curl -o $HOME/.bundle.yaml "https://raw.githubusercontent.com/nokia-eda/edaadm/refs/heads/main/bundles/eda-bundle-core-$EDA_VERSION.yaml" && \ From 389b39a8da7f342d94833c78f976a102af6ea597 Mon Sep 17 00:00:00 2001 From: hellt Date: Sun, 11 Jan 2026 00:01:39 +0100 Subject: [PATCH 28/29] correct flag --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 107114a..7a1c5b0 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -41,7 +41,7 @@ RUN echo 'export PATH="$PATH:$EDA_PLAYGROUND_DIR/tools"' >> /etc/zsh/zshrc USER vscode -RUN git clone --depth 1 --name v0.0.1 "https://github.com/$EDA_PLAYGROUND_REPO" $EDA_PLAYGROUND_DIR && cd $EDA_PLAYGROUND_DIR && \ +RUN git clone --depth 1 --branch v0.0.1 "https://github.com/$EDA_PLAYGROUND_REPO" $EDA_PLAYGROUND_DIR && cd $EDA_PLAYGROUND_DIR && \ make download-tools RUN curl -o $HOME/.bundle.yaml "https://raw.githubusercontent.com/nokia-eda/edaadm/refs/heads/main/bundles/eda-bundle-core-$EDA_VERSION.yaml" && \ From 4d2e71c52b9386d930908ecd3f528c6477048377 Mon Sep 17 00:00:00 2001 From: hellt Date: Sun, 11 Jan 2026 00:29:48 +0100 Subject: [PATCH 29/29] use overrides var --- .devcontainer/postCreate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/postCreate.sh b/.devcontainer/postCreate.sh index 75e367b..b32d69e 100755 --- a/.devcontainer/postCreate.sh +++ b/.devcontainer/postCreate.sh @@ -9,4 +9,4 @@ ensure-docker-is-ready TOKEN=$($EDA_PLAYGROUND_DIR/tools/yq -o=json '.assets.registries[].auth' $HOME/.bundle.yaml | jq -r '(reduce range(.extraEncodeCount + 1) as $_ (.username; @base64d)) + ":" + (reduce range(.extraEncodeCount + 1) as $_ (.password; @base64d))') docker exec k3d-eda-demo-server-0 sh -c "cat /opt/images.txt | xargs -P $NUM_CONCURRENT_IMG_PREPULLS -I {} crictl pull --creds $TOKEN {}" -make -f Makefile -f /workspaces/codespaces/.devcontainer/overrides.mk try-eda NO_KIND=yes NO_LB=yes KPT_SETTERS_FILE=$TRY_EDA_KPT_SETTERS_FILE \ No newline at end of file +make -f Makefile -f $TRY_EDA_OVERRIDES_FILE try-eda NO_KIND=yes NO_LB=yes KPT_SETTERS_FILE=$TRY_EDA_KPT_SETTERS_FILE \ No newline at end of file