From 9c86d03c43979764c5de1d63fcec38253f44fa29 Mon Sep 17 00:00:00 2001 From: Qiaozp Date: Sun, 21 May 2023 19:30:04 +0800 Subject: [PATCH 1/3] Fix: server test fails for k3d version Signed-off-by: Qiaozp --- .github/workflows/server-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/server-test.yml b/.github/workflows/server-test.yml index ed28a89b3..0a7fb1182 100644 --- a/.github/workflows/server-test.yml +++ b/.github/workflows/server-test.yml @@ -96,7 +96,7 @@ jobs: if: needs.detect-noop.outputs.noop != 'true' strategy: matrix: - k8s-version: ["v1.20","v1.24"] + k8s-version: ["v1.26"] concurrency: group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.k8s-version }} cancel-in-progress: true @@ -187,4 +187,4 @@ jobs: name: codecov-umbrella - name: Clean e2e profile - run: rm /tmp/e2e_apiserver_test.out \ No newline at end of file + run: rm /tmp/e2e_apiserver_test.out From 13cbe05537623075147a90ddc992f3942a7cff9c Mon Sep 17 00:00:00 2001 From: Qiaozp Date: Sun, 21 May 2023 19:33:48 +0800 Subject: [PATCH 2/3] keep v1.21 Signed-off-by: Qiaozp --- .github/workflows/server-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/server-test.yml b/.github/workflows/server-test.yml index 0a7fb1182..356be4b70 100644 --- a/.github/workflows/server-test.yml +++ b/.github/workflows/server-test.yml @@ -96,7 +96,7 @@ jobs: if: needs.detect-noop.outputs.noop != 'true' strategy: matrix: - k8s-version: ["v1.26"] + k8s-version: ["v1.21", "v1.26"] concurrency: group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.k8s-version }} cancel-in-progress: true @@ -132,7 +132,7 @@ jobs: - name: Calculate K3d args run: | EGRESS_ARG="" - if [[ "${{ matrix.k8s-version }}" == v1.24 ]]; then + if [[ "${{ matrix.k8s-version }}" == v1.26 ]]; then EGRESS_ARG="--k3s-arg --egress-selector-mode=disabled@server:0" fi echo "EGRESS_ARG=${EGRESS_ARG}" >> $GITHUB_ENV From f9882db9c708f49afeff3c37389616b08f3b2390 Mon Sep 17 00:00:00 2001 From: Qiaozp Date: Sun, 21 May 2023 20:35:41 +0800 Subject: [PATCH 3/3] Fix: velaql test Signed-off-by: Qiaozp --- e2e-test/velaql_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/e2e-test/velaql_test.go b/e2e-test/velaql_test.go index 9f6e519d3..7a788bd4f 100644 --- a/e2e-test/velaql_test.go +++ b/e2e-test/velaql_test.go @@ -27,7 +27,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/pkg/errors" - batchv1beta1 "k8s.io/api/batch/v1beta1" + batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" @@ -227,7 +227,7 @@ var _ = Describe("Test velaQL rest api", func() { return nil }, 3*time.Second).WithTimeout(time.Minute).Should(BeNil()) - newWorkload := new(batchv1beta1.CronJob) + newWorkload := new(batchv1.CronJob) Eventually(func() error { return k8sClient.Get(context.Background(), client.ObjectKey{Name: component2Name, Namespace: namespace}, newWorkload) }, 3*time.Second).WithTimeout(time.Minute).Should(BeNil()) @@ -499,7 +499,7 @@ spec: cue: template: | output: { - apiVersion: "batch/v1beta1" + apiVersion: "batch/v1" kind: "CronJob" metadata: name: context.name spec: {