Retry k3d image import in workflows

.github/scripts/k3d-import-retry.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -euxo pipefail
+
+container=${1:-k3d-upstream}
+name=${2:-fleet}
+shift
+shift
+
+echo "Run k3d import with \"$*\" and retry if '$name' is not found in 'critcl images' output"
+
+i=0
+while ! ( docker exec "$container"-server-0 /bin/crictl images | grep -q "$name" ); do
+  i=$((i + 1))
+  if (( i > 3 )); then
+    echo "failed to import images"
+    exit 1
+  fi
+  k3d image import "$@"
+  # crictl images doesn't show the image immediately after import
+  sleep 20
+done

.github/workflows/e2e-ci.yml

@@ -81,8 +81,10 @@ jobs:
       -
         name: Import Images Into k3d
         run: |
-          k3d image import rancher/fleet:dev rancher/fleet-agent:dev
-          k3d image import nginx-git:test nginx-git:test
+          ./.github/scripts/k3d-import-retry.sh k3d-k3s-default fleet \
+            rancher/fleet:dev rancher/fleet-agent:dev
+          ./.github/scripts/k3d-import-retry.sh k3d-k3s-default nginx-git \
+            nginx-git:test nginx-git:test
       -
         name: Set Up Tmate Debug Session
         if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.enable_tmate == 'true' }}

.github/workflows/e2e-multicluster-ci.yml

@@ -85,8 +85,10 @@ jobs:
       -
         name: Import Images Into k3d
         run: |
-          k3d image import rancher/fleet:dev rancher/fleet-agent:dev -c upstream
-          k3d image import rancher/fleet-agent:dev -c downstream
+          ./.github/scripts/k3d-import-retry.sh k3d-upstream fleet \
+            rancher/fleet:dev rancher/fleet-agent:dev -c upstream
+          ./.github/scripts/k3d-import-retry.sh k3d-downstream fleet-agent \
+            rancher/fleet-agent:dev -c downstream
       -
         name: Set Up Tmate Debug Session
         if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.enable_tmate == 'true' }}

.github/workflows/fleet-upgrade.yml

@@ -87,7 +87,8 @@ jobs:
       -
         name: Import Images Into k3d
         run: |
-          k3d image import rancher/fleet:dev rancher/fleet-agent:dev -c upstream
+          ./.github/scripts/k3d-import-retry.sh k3d-upstream fleet \
+            rancher/fleet:dev rancher/fleet-agent:dev -c upstream
       -
         name: Verify Example Workload
         run: |

.github/workflows/nightly-ci.yml

@@ -77,8 +77,10 @@ jobs:
       -
         name: Import Images Into k3d
         run: |
-          k3d image import rancher/fleet:dev rancher/fleet-agent:dev
-          k3d image import nginx-git:test nginx-git:test
+          ./.github/scripts/k3d-import-retry.sh k3d-k3s-default fleet \
+            rancher/fleet:dev rancher/fleet-agent:dev
+          ./.github/scripts/k3d-import-retry.sh k3d-k3s-default nginx-git \
+            nginx-git:test
       -
         name: Deploy Fleet
         run: |