Skip to content

Commit 391cca0

Browse files
authored
fix: add vcluster port-forward command to use as the background proxy… (#2872) (#2876)
* 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 c35b71d commit 391cca0

File tree

6 files changed

+566
-36
lines changed

6 files changed

+566
-36
lines changed

.github/workflows/e2e.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,7 @@ jobs:
275275
run: |
276276
chmod +x ./vcluster-current
277277
278+
docker load --input vcluster_syncer
278279
kind load image-archive vcluster_syncer
279280
yq eval '.controlPlane.distro.${{ matrix.distribution }}.enabled = true' > ./test/vcluster-current.yaml
280281
@@ -423,6 +424,7 @@ jobs:
423424
sed -i "s|REPLACE_TAG_NAME|${{ env.TAG_NAME }}|g" ${{ matrix.test-suite-path }}/../commonValues.yaml
424425
yq eval -i '.controlPlane.distro.${{ matrix.distribution }}.enabled = true' ${{ matrix.test-suite-path }}/../commonValues.yaml
425426
427+
docker load --input vcluster_syncer
426428
kind load image-archive vcluster_syncer
427429
428430
chmod +x vcluster && sudo mv vcluster /usr/bin
@@ -474,7 +476,12 @@ jobs:
474476
475477
sudo chmod +x $(echo "${{ matrix.test-suite-path }}" | sed "s#./test/##g").test
476478
477-
VCLUSTER_SUFFIX=${{ env.VCLUSTER_SUFFIX }} VCLUSTER_NAME=${{ env.VCLUSTER_NAME }} VCLUSTER_NAMESPACE=${{ env.VCLUSTER_NAMESPACE }} MULTINAMESPACE_MODE=${{ matrix.multinamespace-mode }} ./$(echo "${{ matrix.test-suite-path }}" | sed "s#./test/##g").test -test.v --ginkgo.v --ginkgo.skip='.*NetworkPolicy.*' --ginkgo.fail-fast
479+
VCLUSTER_SUFFIX=${{ env.VCLUSTER_SUFFIX }} \
480+
VCLUSTER_NAME=${{ env.VCLUSTER_NAME }} \
481+
VCLUSTER_NAMESPACE=${{ env.VCLUSTER_NAMESPACE }} \
482+
VCLUSTER_BACKGROUND_PROXY_IMAGE=${{ env.REPOSITORY_NAME }}:${{ env.TAG_NAME }} \
483+
MULTINAMESPACE_MODE=${{ matrix.multinamespace-mode }} \
484+
./$(echo "${{ matrix.test-suite-path }}" | sed "s#./test/##g").test -test.v --ginkgo.v --ginkgo.skip='.*NetworkPolicy.*' --ginkgo.fail-fast
478485
if kubectl logs -l app=${{ env.VCLUSTER_SUFFIX }} -n ${{ env.VCLUSTER_NAMESPACE }} -c syncer --tail=-1 -p >/dev/null 2>/dev/null; then
479486
echo "vCluster has restarted during testing, failing..."
480487
exit 1

0 commit comments

Comments
 (0)