Skip to content

Commit

Permalink
upgrade ginkgo to v2.11.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@nce3xin
nce3xin committed Nov 29, 2024
1 parent 13a7107 commit 185240b
Show file tree
Hide file tree
Showing 33 changed files with 34 additions and 34 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ require (
github.com/k8stopologyawareschedwg/noderesourcetopology-api v0.1.1
github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb
github.com/mwitkow/grpc-proxy v0.0.0-20230212185441-f345521cb9c9
github.com/onsi/ginkgo v1.16.5
github.com/onsi/ginkgo/v2 v2.11.0
github.com/onsi/gomega v1.27.10
github.com/opencontainers/runc v1.1.7
github.com/openkruise/kruise-api v1.5.0
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ import (
// test/e2e/lifecycle/framework.go
package lifecycle
import "github.com/onsi/ginkgo"
import "github.com/onsi/ginkgo/v2"
// SIGDescribe annotates the test with the SIG label.
func SIGDescribe(text string, body func()) bool {
Expand All @@ -58,7 +58,7 @@ func SIGDescribe(text string, body func()) bool {
package bootstrap
import (
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/koordinator-sh/koordinator/test/e2e/lifecycle"
)
var _ = lifecycle.SIGDescribe("[Feature:BootstrapTokens]", func() {
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/e2e.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ import (
"testing"
"time"

"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/config"
"github.com/onsi/ginkgo/reporters"

Check failure on line 33 in test/e2e/e2e.go

View workflow job for this annotation

GitHub Actions / slo-controller 

github.com/onsi/ginkgo/[email protected]: missing go.sum entry for go.mod file; to add it:

Check failure on line 33 in test/e2e/e2e.go

View workflow job for this annotation

GitHub Actions / slo-controller 

github.com/onsi/ginkgo/[email protected]: missing go.sum entry for go.mod file; to add it:

Check failure on line 33 in test/e2e/e2e.go

View workflow job for this annotation

GitHub Actions / slo-controller 

github.com/onsi/ginkgo/[email protected]: missing go.sum entry for go.mod file; to add it:

Check failure on line 33 in test/e2e/e2e.go

View workflow job for this annotation

GitHub Actions / unit-tests(Check manifests) 

github.com/onsi/ginkgo/[email protected]: missing go.sum entry for go.mod file; to add it:

Check failure on line 33 in test/e2e/e2e.go

View workflow job for this annotation

GitHub Actions / unit-tests(Verify govet) 

github.com/onsi/ginkgo/[email protected]: missing go.sum entry for go.mod file; to add it:
"github.com/onsi/ginkgo/v2"
"github.com/onsi/gomega"

v1 "k8s.io/api/core/v1"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/e2e_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
// the ginkgo test runner will not detect that this
// directory contains a Ginkgo test suite.
// See https://github.com/kubernetes/kubernetes/issues/74827
// "github.com/onsi/ginkgo"
// "github.com/onsi/ginkgo/v2"

"k8s.io/component-base/version"

Expand Down
2 changes: 1 addition & 1 deletion test/e2e/framework/framework.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ import (
"k8s.io/client-go/restmapper"
scaleclient "k8s.io/client-go/scale"

"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/onsi/gomega"

koordinatorclientset "github.com/koordinator-sh/koordinator/pkg/client/clientset/versioned"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/framework/ginkgowrapper/wrapper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"runtime/debug"
"strings"

"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"

Check failure on line 30 in test/e2e/framework/ginkgowrapper/wrapper.go

View workflow job for this annotation

GitHub Actions / slo-controller 

github.com/onsi/ginkgo/[email protected]: missing go.sum entry for go.mod file; to add it:

Check failure on line 30 in test/e2e/framework/ginkgowrapper/wrapper.go

View workflow job for this annotation

GitHub Actions / slo-controller 

github.com/onsi/ginkgo/[email protected]: missing go.sum entry for go.mod file; to add it:

Check failure on line 30 in test/e2e/framework/ginkgowrapper/wrapper.go

View workflow job for this annotation

GitHub Actions / slo-controller 

github.com/onsi/ginkgo/[email protected]: missing go.sum entry for go.mod file; to add it:

Check failure on line 30 in test/e2e/framework/ginkgowrapper/wrapper.go

View workflow job for this annotation

GitHub Actions / unit-tests(Check manifests) 

github.com/onsi/ginkgo/[email protected]: missing go.sum entry for go.mod file; to add it:

Check failure on line 30 in test/e2e/framework/ginkgowrapper/wrapper.go

View workflow job for this annotation

GitHub Actions / unit-tests(Verify govet) 

github.com/onsi/ginkgo/[email protected]: missing go.sum entry for go.mod file; to add it:
)

// FailurePanic is the value that will be panicked from Fail.
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/framework/kubectl/kubectl_utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import (
e2elog "github.com/koordinator-sh/koordinator/test/e2e/framework/log"
e2epod "github.com/koordinator-sh/koordinator/test/e2e/framework/pod"

"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/framework/log.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"runtime/debug"
"time"

"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"

// TODO: Remove the following imports (ref: https://github.com/kubernetes/kubernetes/issues/81245)
e2eginkgowrapper "github.com/koordinator-sh/koordinator/test/e2e/framework/ginkgowrapper"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/framework/log/logger.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"fmt"
"time"

"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"

e2eginkgowrapper "github.com/koordinator-sh/koordinator/test/e2e/framework/ginkgowrapper"
)
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/framework/log_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
"strings"
"testing"

"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/config"
"github.com/onsi/ginkgo/reporters"
"github.com/onsi/ginkgo/v2"
"github.com/onsi/gomega"

"github.com/koordinator-sh/koordinator/test/e2e/framework"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/framework/node/resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"strings"
"time"

"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/onsi/gomega"

v1 "k8s.io/api/core/v1"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/framework/nodes_util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"sync"
"time"

"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"

v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/util/wait"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/framework/pod/delete.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"fmt"
"time"

"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"

v1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/framework/pod/resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"strings"
"time"

"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/onsi/gomega"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/framework/pod/wait.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"text/tabwriter"
"time"

"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"

v1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/framework/pods.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (
v1core "k8s.io/client-go/kubernetes/typed/core/v1"
"k8s.io/kubectl/pkg/util/podutils"

"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/onsi/gomega"

// TODO: Remove the following imports (ref: https://github.com/kubernetes/kubernetes/issues/81245)
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/framework/psp.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (

imageutils "github.com/koordinator-sh/koordinator/test/utils/image"

"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"

// TODO: Remove the following imports (ref: https://github.com/kubernetes/kubernetes/issues/81245)
e2eauth "github.com/koordinator-sh/koordinator/test/e2e/framework/auth"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/framework/skipper/skipper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"runtime/debug"
"strings"

"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"

apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/framework/util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import (
"syscall"
"time"

"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/onsi/gomega"
gomegatypes "github.com/onsi/gomega/types"

Expand Down
2 changes: 1 addition & 1 deletion test/e2e/quota/framework.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ limitations under the License.

package quota

import "github.com/onsi/ginkgo"
import "github.com/onsi/ginkgo/v2"

// SIGDescribe describes SIG information
func SIGDescribe(text string, body func()) bool {
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/quota/multi_tree.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"fmt"
"time"

"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/onsi/gomega"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/quota/quota.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"fmt"
"time"

"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/onsi/gomega"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/quota/quota_guaranteed.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"strings"
"time"

"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/onsi/gomega"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/scheduling/deviceshare.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"sort"
"time"

"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/onsi/gomega"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/equality"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/scheduling/framework.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ limitations under the License.

package scheduling

import "github.com/onsi/ginkgo"
import "github.com/onsi/ginkgo/v2"

// SIGDescribe describes SIG information
func SIGDescribe(text string, body func()) bool {
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/scheduling/helper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (

nrtv1alpha1 "github.com/k8stopologyawareschedwg/noderesourcetopology-api/pkg/apis/topology/v1alpha1"
nrtclientset "github.com/k8stopologyawareschedwg/noderesourcetopology-api/pkg/generated/clientset/versioned"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/onsi/gomega"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/scheduling/hostport.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"context"
"time"

"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/onsi/gomega"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/scheduling/nodenumaresource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"time"

nrtclientset "github.com/k8stopologyawareschedwg/noderesourcetopology-api/pkg/generated/clientset/versioned"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/onsi/gomega"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/equality"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/scheduling/preemption.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"fmt"
"time"

"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/scheduling/reservation.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"sort"
"time"

"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/onsi/gomega"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/equality"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/slocontroller/batchresource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"context"
"time"

"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/onsi/gomega"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/slocontroller/cpunormalization.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (

topov1alpha1 "github.com/k8stopologyawareschedwg/noderesourcetopology-api/pkg/apis/topology/v1alpha1"
nrtclientset "github.com/k8stopologyawareschedwg/noderesourcetopology-api/pkg/generated/clientset/versioned"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/onsi/gomega"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/slocontroller/framework.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ limitations under the License.

package slocontroller

import "github.com/onsi/ginkgo"
import "github.com/onsi/ginkgo/v2"

// SIGDescribe describes SIG information
func SIGDescribe(text string, body func()) bool {
Expand Down

0 comments on commit 185240b

Please sign in to comment.