Skip to content

Commit 89f49f6

Browse files
authored
fix: add vcluster port-forward command to use as the background proxy… (#2872) (#2875)
* fix: add vcluster port-forward command to use as the background proxy process until containerd/containerd#9875 is resolved * feat: allow setting the background proxy image via environment variable (cherry picked from commit 74e339e) # Conflicts: # .github/workflows/e2e.yaml # pkg/cli/flags/connect/connect.go # pkg/cli/flags/create/create.go # pkg/constants/cli.go # test/framework/framework.go
1 parent 2554497 commit 89f49f6

File tree

6 files changed

+561
-35
lines changed

6 files changed

+561
-35
lines changed

.github/workflows/e2e.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@ jobs:
217217
run: |
218218
chmod +x ./vcluster-current
219219
220+
docker load --input vcluster_syncer
220221
kind load image-archive vcluster_syncer
221222
yq eval '.controlPlane.distro.${{ matrix.distribution }}.enabled = true' > ./test/vcluster-current.yaml
222223
@@ -357,6 +358,7 @@ jobs:
357358
sed -i "s|REPLACE_TAG_NAME|${{ env.TAG_NAME }}|g" ${{ matrix.test-suite-path }}/../commonValues.yaml
358359
yq eval -i '.controlPlane.distro.${{ matrix.distribution }}.enabled = true' ${{ matrix.test-suite-path }}/../commonValues.yaml
359360
361+
docker load --input vcluster_syncer
360362
kind load image-archive vcluster_syncer
361363
362364
chmod +x vcluster && sudo mv vcluster /usr/bin
@@ -409,6 +411,7 @@ jobs:
409411
VCLUSTER_SUFFIX=${{ env.VCLUSTER_SUFFIX }} \
410412
VCLUSTER_NAME=${{ env.VCLUSTER_NAME }} \
411413
VCLUSTER_NAMESPACE=${{ env.VCLUSTER_NAMESPACE }} \
414+
VCLUSTER_BACKGROUND_PROXY_IMAGE=${{ env.REPOSITORY_NAME }}:${{ env.TAG_NAME }} \
412415
MULTINAMESPACE_MODE=${{ matrix.multinamespace-mode }} \
413416
go test -timeout 40m -mod=vendor -test.v --ginkgo.v --ginkgo.skip='.*NetworkPolicy.*' --ginkgo.fail-fast ${{ matrix.test-suite-path }}
414417
if kubectl logs -l app=${{ env.VCLUSTER_SUFFIX }} -n ${{ env.VCLUSTER_NAMESPACE }} -c syncer --tail=-1 -p >/dev/null 2>/dev/null; then

0 commit comments

Comments
 (0)