fix: version

Signed-off-by: Lin Yang <[email protected]>
flomesh-io · Jan 5, 2025 · f334d5b · f334d5b
1 parent 9d285c2
commit f334d5b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -219,7 +219,7 @@ jobs:
         run: |
           export PATH=$PWD/bin:$PATH
           echo "PATH=$PATH"
-          go test ./tests/e2e -test.v -ginkgo.v -ginkgo.progress -installType=KindCluster -kindClusterVersion='${{ matrix.k8s_version }}' -test.timeout 0 -test.failfast -ginkgo.failFast -ginkgo.focus='\[Bucket ${{ matrix.bucket }}\].*${{ matrix.focus }}'
+          go test ./tests/e2e -test.v -ginkgo.v -ginkgo.progress -installType=KindCluster -clusterVersion='${{ matrix.k8s_version }}' -test.timeout 0 -test.failfast -ginkgo.failFast -ginkgo.focus='\[Bucket ${{ matrix.bucket }}\].*${{ matrix.focus }}'
         continue-on-error: true
       - name: Set Logs name
         if: ${{ steps.test.conclusion != 'skipped' }}
@@ -248,7 +248,8 @@ jobs:
     needs: build
     strategy:
       matrix:
-        k8s_version: ["", "v1.19.16-k3s1", "v1.21.14-k3s1", "v1.23.17-k3s1"]
+#        k8s_version: ["", "v1.19.16-k3s1", "v1.21.14-k3s1", "v1.23.17-k3s1"]
+        k8s_version: ["", "v1.21.14-k3s1", "v1.23.17-k3s1"]
         focus: [""]
         bucket: [6]
     env:
@@ -277,7 +278,7 @@ jobs:
       - name: Create k3d managed registry
         if: ${{ env.CLUSTER_INSTALL_TYPE == 'K3dCluster' }}
         run: |
-          k3d registry create "registry" --port "127.0.0.1:5001" --default-network bridge
+          k3d registry create registry --port "127.0.0.1:5001"
       - name: Checkout
         uses: actions/checkout@v4
       - name: Setup Go
@@ -305,7 +306,7 @@ jobs:
         run: |
           export PATH=$PWD/bin:$PATH
           echo "PATH=$PATH"
-          go test ./tests/e2e -test.v -ginkgo.v -ginkgo.progress -installType=${{ env.CLUSTER_INSTALL_TYPE }} -kindClusterVersion='${{ matrix.k8s_version }}' -test.timeout 0 -test.failfast -ginkgo.failFast -ginkgo.focus='\[Bucket ${{ matrix.bucket }}\].*${{ matrix.focus }}'
+          go test ./tests/e2e -test.v -ginkgo.v -ginkgo.progress -installType=${{ env.CLUSTER_INSTALL_TYPE }} -clusterVersion='${{ matrix.k8s_version }}' -test.timeout 0 -test.failfast -ginkgo.failFast -ginkgo.focus='\[Bucket ${{ matrix.bucket }}\].*${{ matrix.focus }}'
         continue-on-error: true
       - name: Set Logs name
         if: ${{ steps.test.conclusion != 'skipped' }}
@@ -371,7 +372,7 @@ jobs:
         run: |
           export PATH=$PWD/bin:$PATH
           echo "PATH=$PATH"
-          go test ./tests/e2e -test.v -ginkgo.v -ginkgo.progress -installType=KindCluster -kindClusterVersion='${{ matrix.k8s_version }}' -test.timeout 0 -test.failfast -ginkgo.failFast -ginkgo.focus='\[Bucket ${{ matrix.bucket }}\].*${{ matrix.focus }}'
+          go test ./tests/e2e -test.v -ginkgo.v -ginkgo.progress -installType=KindCluster -clusterVersion='${{ matrix.k8s_version }}' -test.timeout 0 -test.failfast -ginkgo.failFast -ginkgo.focus='\[Bucket ${{ matrix.bucket }}\].*${{ matrix.focus }}'
         continue-on-error: true
       - name: Set Logs name
         if: ${{ steps.test.conclusion != 'skipped' }}
@@ -434,7 +435,7 @@ jobs:
         run: |
           export PATH=$PWD/bin:$PATH
           echo "PATH=$PATH"
-          go test ./tests/e2e -test.v -ginkgo.v -ginkgo.progress -installType=KindCluster -kindClusterVersion='${{ matrix.k8s_version }}' -test.timeout 0 -test.failfast -ginkgo.failFast -ginkgo.focus='\[Bucket ${{ matrix.bucket }}\].*${{ matrix.focus }}'
+          go test ./tests/e2e -test.v -ginkgo.v -ginkgo.progress -installType=KindCluster -clusterVersion='${{ matrix.k8s_version }}' -test.timeout 0 -test.failfast -ginkgo.failFast -ginkgo.focus='\[Bucket ${{ matrix.bucket }}\].*${{ matrix.focus }}'
         continue-on-error: true
       - name: Set Logs name
         if: ${{ steps.test.conclusion != 'skipped' }}
@@ -497,7 +498,7 @@ jobs:
         run: |
           export PATH=$PWD/bin:$PATH
           echo "PATH=$PATH"
-          go test ./tests/e2e -test.v -ginkgo.v -ginkgo.progress -installType=KindCluster -kindClusterVersion='${{ matrix.k8s_version }}' -test.timeout 0 -test.failfast -ginkgo.failFast -ginkgo.focus='\[Bucket ${{ matrix.bucket }}\].*${{ matrix.focus }}'
+          go test ./tests/e2e -test.v -ginkgo.v -ginkgo.progress -installType=KindCluster -clusterVersion='${{ matrix.k8s_version }}' -test.timeout 0 -test.failfast -ginkgo.failFast -ginkgo.focus='\[Bucket ${{ matrix.bucket }}\].*${{ matrix.focus }}'
         continue-on-error: true
       - name: Set Logs name
         if: ${{ steps.test.conclusion != 'skipped' }}

diff --git a/tests/framework/common.go b/tests/framework/common.go
@@ -165,7 +165,7 @@ func registerFlags(td *FsmTestData) {
 
 	flag.BoolVar(&td.CleanupCluster, "cleanupCluster", true, "Cleanup kind/k3d cluster upon exit")
 	flag.BoolVar(&td.CleanupClusterBetweenTests, "cleanupClusterBetweenTests", false, "Cleanup kind/k3d cluster between tests")
-	flag.StringVar(&td.ClusterVersion, "kindClusterVersion", "", "Kind/K3d cluster version, ex. v.1.20.2")
+	flag.StringVar(&td.ClusterVersion, "clusterVersion", "", "Kind/K3d cluster version, ex. v.1.20.2")
 
 	flag.StringVar(&td.CtrRegistryServer, "ctrRegistry", os.Getenv("CTR_REGISTRY"), "Container registry")
 	flag.StringVar(&td.CtrRegistryUser, "ctrRegistryUser", os.Getenv("CTR_REGISTRY_USER"), "Container registry")

diff --git a/tests/framework/k3d-cluster.yaml b/tests/framework/k3d-cluster.yaml
@@ -4,7 +4,9 @@ metadata:
   name: fsm-e2e
 servers: 1
 agents: 1
-network: fsm
+kubeAPI:
+  hostIP: "0.0.0.0"
+  hostPort: "6443"
 ports:
   - port: 80:80
     nodeFilters: