From a62feaba275fc7f94d22460ca2e62995826b2657 Mon Sep 17 00:00:00 2001 From: Oliver Gould Date: Wed, 4 Dec 2024 15:37:40 +0000 Subject: [PATCH 1/2] ci: increase linkerd-install readiness timeout CI runs frequently timeout waiting for pod readiness. There is a hardcoded 1m timeout. This change makes this timeout configurable, specifying a 2m timeout in the CI configuration. --- .github/workflows/pr.yml | 2 ++ justfile | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 5293684e51..119aace699 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -127,6 +127,8 @@ jobs: if: needs.meta.outputs.cargo_changed == 'true' || needs.meta.outputs.rust_changed == 'true' timeout-minutes: 20 runs-on: ubuntu-latest + env: + WAIT_TIMOUT: 2m steps: - uses: linkerd/dev/actions/setup-tools@v43 - name: scurl https://run.linkerd.io/install-edge | sh diff --git a/justfile b/justfile index a5983a8f2c..7ba9492561 100644 --- a/justfile +++ b/justfile @@ -57,6 +57,8 @@ _features := if features == "all" { "--no-default-features --features=" + features } else { "" } +wait-timeout := env_var_or_default("WAIT_TIMEOUT", "1m") + export CXX := 'clang++-14' # @@ -272,7 +274,7 @@ _linkerd-crds-install: _k3d-ready | {{ _kubectl }} apply -f - {{ _kubectl }} wait crd --for condition=established \ --selector='linkerd.io/control-plane-ns' \ - --timeout=1m + --timeout={{ wait-timeout }} # Install linkerd on the test cluster using test images. linkerd-install *args='': _tag-set k3d-load-linkerd _linkerd-crds-install && _linkerd-ready @@ -313,7 +315,7 @@ linkerd-check-control-plane-proxy: _linkerd-ready: {{ _kubectl }} wait pod --for=condition=ready \ --namespace=linkerd --selector='linkerd.io/control-plane-component' \ - --timeout=1m + --timeout={{ wait-timeout }} # # Dev Container From c7e697421b1d7ca5c7f1fade3175d8e74e033dc1 Mon Sep 17 00:00:00 2001 From: Oliver Gould Date: Wed, 4 Dec 2024 07:45:57 -0800 Subject: [PATCH 2/2] Update .github/workflows/pr.yml Co-authored-by: Alejandro Pedraza --- .github/workflows/pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 119aace699..69b9bf49ab 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -128,7 +128,7 @@ jobs: timeout-minutes: 20 runs-on: ubuntu-latest env: - WAIT_TIMOUT: 2m + WAIT_TIMEOUT: 2m steps: - uses: linkerd/dev/actions/setup-tools@v43 - name: scurl https://run.linkerd.io/install-edge | sh