From e109d4e525dfc253e861c82901d3947688555d7c Mon Sep 17 00:00:00 2001 From: Somefive Date: Tue, 23 May 2023 14:46:22 +0800 Subject: [PATCH] Chore: upgrade kubebuilder installation in unit-test ci (#6018) * Chore: upgrade kubebuilder installation in unit-test ci Signed-off-by: Somefive * upgrade ingress in kuebuilder test Signed-off-by: Somefive --------- Signed-off-by: Somefive --- .github/workflows/unit-test.yml | 6 +++--- pkg/velaql/providers/query/handler_test.go | 6 +++--- references/cli/velaql_test.go | 5 +++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 31ca827a1..8f6008f15 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -73,11 +73,11 @@ jobs: # TODO need update action version to resolve node 12 deprecated. - name: install Kubebuilder - uses: RyanSiu1995/kubebuilder-action@ff52bff1bae252239223476e5ab0d71d6ba02343 + uses: RyanSiu1995/kubebuilder-action@ed0e300b13152c2c2bfb104475665c7bf609332f with: - version: 3.1.0 + version: 3.9.1 kubebuilderOnly: false - kubernetesVersion: v1.21.2 + kubernetesVersion: v1.26.2 - name: Run Make test run: make test diff --git a/pkg/velaql/providers/query/handler_test.go b/pkg/velaql/providers/query/handler_test.go index 7682521e2..17bcdedad 100644 --- a/pkg/velaql/providers/query/handler_test.go +++ b/pkg/velaql/providers/query/handler_test.go @@ -514,7 +514,7 @@ options: { Kind: "Ingress", Namespace: "default", Name: "ingress-http", - APIVersion: "networking.k8s.io/v1beta1", + APIVersion: "networking.k8s.io/v1", }, }, { @@ -523,7 +523,7 @@ options: { Kind: "Ingress", Namespace: "default", Name: "ingress-https", - APIVersion: "networking.k8s.io/v1beta1", + APIVersion: "networking.k8s.io/v1", }, }, { @@ -532,7 +532,7 @@ options: { Kind: "Ingress", Namespace: "default", Name: "ingress-paths", - APIVersion: "networking.k8s.io/v1beta1", + APIVersion: "networking.k8s.io/v1", }, }, { diff --git a/references/cli/velaql_test.go b/references/cli/velaql_test.go index d934c6f61..7eb1c46cd 100644 --- a/references/cli/velaql_test.go +++ b/references/cli/velaql_test.go @@ -33,6 +33,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" pkgtypes "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/intstr" + "k8s.io/utils/strings/slices" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/yaml" @@ -463,8 +464,8 @@ var _ = Describe("Test velaQL", func() { fmt.Sprintf("http://%s:30002", gatewayIP), "http://ingress.domain.helm", } - for i, endpoint := range endpoints { - Expect(endpoint.String()).Should(BeEquivalentTo(urls[i])) + for _, endpoint := range endpoints { + Expect(slices.Contains(urls, endpoint.String())).Should(BeTrue()) } }) })