don't install gwapi in target cluster

Author: alpeb

.github/workflows/integration.yml

@@ -336,9 +336,10 @@ jobs:
       fail-fast: false
       matrix:
         cases:
-        - {k8s: "v1.23", manage-controllers: false}
-        - {k8s: "v1.34", manage-controllers: false}
-        - {k8s: "v1.34", manage-controllers: true}
+        - {k8s: "v1.23", manage-controllers: false, install-gwapi: true}
+        # for v1.34 onwards, gwapi gets installed by Traefik on the target cluster
+        - {k8s: "v1.34", manage-controllers: false, install-gwapi: false}
+        - {k8s: "v1.34", manage-controllers: true, install-gwapi: false}
     name: "test-multicluster(${{ matrix.cases.k8s }}, ${{ matrix.cases.manage-controllers && 'managed-controllers' || 'unmanaged-controllers' }})"
     steps:
       - uses: extractions/setup-just@e33e0265a09d6d736e2ee1e0eb685ef1de4669ff
@@ -370,11 +371,20 @@ jobs:
           done
       - run: docker image ls
       - run: just mc-test-build
-      - name: Run just mc-test-load
+      - name: Run just mc-load
         run: |
           just linkerd-tag='${{ needs.meta.outputs.tag }}' \
               k3d-k8s='${{ matrix.cases.k8s }}' \
-              mc-test-load
+              mc-load
+      - run: just mc-install-gwapi-source
+      - name: Run just mc-target-load
+        run: |
+          just linkerd-tag='${{ needs.meta.outputs.tag }}' \
+              k3d-k8s='${{ matrix.cases.k8s }}' \
+              mc-target-load
+      - run: just mc-install-gwapi-target
+        if: ${{ matrix.cases.install-gwapi }}
+      - run: just mc-flat-network-init
       - name: Run just mc-test-run
         run: |
           just linkerd-tag='${{ needs.meta.outputs.tag }}' \
@@ -426,12 +436,6 @@ jobs:
           echo 'needs.test-ext.result: ${{ needs.test-ext.result }}'
           echo 'needs.test-viz.result: ${{ needs.test-viz.result }}'
           echo 'needs.test-multicluster.result: ${{ needs.test-multicluster.result }}'
-          echo "-------- SOURCE -----"
-          kubectl --context k3d-l5d-test get po -A
-          kubectl --context k3d-l5d-test -n linkerd-multicluster describe po
-          echo "-------- TARGET -----"
-          kubectl --context k3d-l5d-test-target get po -A
-          kubectl --context k3d-l5d-test-target -n linkerd-multicluster describe po
       - name: Verify jobs
         # All jobs must succeed or be skipped.
         if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')

justfile

@@ -490,9 +490,9 @@ mc-target-k3d-delete:
             k3d-delete
     fi
 
-_mc-load: _k3d-init linkerd-load
+mc-load: _k3d-init linkerd-load
 
-_mc-target-load:
+mc-target-load:
     @{{ just_executable() }} \
         k3d-name='{{ k3d-name }}-target' \
         k3d-k8s='{{ k3d-k8s }}' \
@@ -505,17 +505,22 @@ _mc-target-load:
         linkerd-exec='{{ linkerd-exec }}' \
         linkerd-tag='{{ linkerd-tag }}' \
         _pause-load \
-        _mc-load
+        mc-load
 
-# Run the multicluster tests with cluster setup
-mc-test: mc-test-load mc-test-run
+mc-install-gwapi-source: _mc-install-gwapi
+
+mc-install-gwapi-target:
+    @{{ just_executable() }} \
+        k3d-name='{{ k3d-name }}-target' \
+		_mc-install-gwapi
+
+_mc-install-gwapi:
+	{{ _kubectl }} apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.2.0/experimental-install.yaml
 
 mc-test-build:
     go build --mod=readonly \
         ./test/integration/multicluster/...
 
-mc-test-load: _mc-load _mc-target-load mc-flat-network-init
-
 k3d-source-server := "k3d-" + k3d-name + "-server-0"
 k3d-target-server := "k3d-" + k3d-name + "-target-server-0"
 

test/integration/multicluster/install_test.go

@@ -94,11 +94,6 @@ func TestInstall(t *testing.T) {
 	// Global state to keep track of clusters
 	contexts = TestHelper.GetMulticlusterContexts()
 	for _, ctx := range contexts {
-		err = TestHelper.InstallGatewayAPIWithContext(ctx)
-		if err != nil {
-			testutil.AnnotatedFatal(t, "failed to install gateway-api", err)
-		}
-
 		// Pipe cmd & args to `linkerd`
 		cmd := append([]string{"--context=" + ctx}, cmd...)
 		out, err := TestHelper.LinkerdRun(cmd...)

testutil/test_helper.go

@@ -749,12 +749,6 @@ func (h *TestHelper) InstallGatewayAPI() error {
 	return err
 }
 
-func (h *TestHelper) InstallGatewayAPIWithContext(ctx string) error {
-	url := fmt.Sprintf("https://github.com/kubernetes-sigs/gateway-api/releases/download/%s/experimental-install.yaml", GATEWAY_API_VERSION)
-	_, err := h.KubectlWithContext("", ctx, "apply", "-f", url)
-	return err
-}
-
 // ReadFile reads a file from disk and returns the contents as a string.
 func ReadFile(file string) (string, error) {
 	b, err := os.ReadFile(file)