Skip to content

Commit dac7fe0

Browse files
acuminoacumino
committed
Adapt ginkgo import paths
1 parent 27ee3f7 commit dac7fe0

File tree

97 files changed

+97
-97
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+97
-97
lines changed

‎pkg/builder/builder_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package builder
1919
import (
2020
"testing"
2121

22-
. "github.com/onsi/ginkgo"
22+
. "github.com/onsi/ginkgo/v2"
2323
. "github.com/onsi/gomega"
2424
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
2525
"k8s.io/apimachinery/pkg/api/meta"

‎pkg/builder/controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"sync/atomic"
2424

2525
"github.com/go-logr/logr"
26-
. "github.com/onsi/ginkgo"
26+
. "github.com/onsi/ginkgo/v2"
2727
. "github.com/onsi/gomega"
2828
appsv1 "k8s.io/api/apps/v1"
2929
corev1 "k8s.io/api/core/v1"

‎pkg/builder/webhook_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"os"
2626
"strings"
2727

28-
. "github.com/onsi/ginkgo"
28+
. "github.com/onsi/ginkgo/v2"
2929
. "github.com/onsi/gomega"
3030
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3131
"k8s.io/apimachinery/pkg/runtime"

‎pkg/cache/cache_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package cache_test
1919
import (
2020
"testing"
2121

22-
. "github.com/onsi/ginkgo"
22+
. "github.com/onsi/ginkgo/v2"
2323
. "github.com/onsi/gomega"
2424
"k8s.io/client-go/kubernetes"
2525
"k8s.io/client-go/rest"

‎pkg/cache/cache_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"sort"
2424
"strconv"
2525

26-
. "github.com/onsi/ginkgo"
2726
. "github.com/onsi/ginkgo/extensions/table"
27+
. "github.com/onsi/ginkgo/v2"
2828
. "github.com/onsi/gomega"
2929

3030
corev1 "k8s.io/api/core/v1"

‎pkg/cache/informer_cache_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package cache_test
1818

1919
import (
20-
. "github.com/onsi/ginkgo"
20+
. "github.com/onsi/ginkgo/v2"
2121
. "github.com/onsi/gomega"
2222

2323
"k8s.io/client-go/rest"

‎pkg/cache/informer_cache_unit_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package cache
1818

1919
import (
20-
. "github.com/onsi/ginkgo"
20+
. "github.com/onsi/ginkgo/v2"
2121
. "github.com/onsi/gomega"
2222

2323
corev1 "k8s.io/api/core/v1"

‎pkg/certwatcher/certwatcher_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"os"
2121
"testing"
2222

23-
. "github.com/onsi/ginkgo"
23+
. "github.com/onsi/ginkgo/v2"
2424
. "github.com/onsi/gomega"
2525
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
2626
logf "sigs.k8s.io/controller-runtime/pkg/log"

‎pkg/certwatcher/certwatcher_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"os"
2929
"time"
3030

31-
. "github.com/onsi/ginkgo"
31+
. "github.com/onsi/ginkgo/v2"
3232
. "github.com/onsi/gomega"
3333
"sigs.k8s.io/controller-runtime/pkg/certwatcher"
3434
)

‎pkg/client/apiutil/apiutil_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package apiutil_test
1919
import (
2020
"testing"
2121

22-
. "github.com/onsi/ginkgo"
22+
. "github.com/onsi/ginkgo/v2"
2323
. "github.com/onsi/gomega"
2424
"k8s.io/client-go/rest"
2525
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"

‎pkg/client/apiutil/dynamicrestmapper_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package apiutil_test
1919
import (
2020
"time"
2121

22-
. "github.com/onsi/ginkgo"
22+
. "github.com/onsi/ginkgo/v2"
2323
. "github.com/onsi/gomega"
2424
"github.com/onsi/gomega/format"
2525
"github.com/onsi/gomega/types"

‎pkg/client/client_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package client_test
1919
import (
2020
"testing"
2121

22-
. "github.com/onsi/ginkgo"
22+
. "github.com/onsi/ginkgo/v2"
2323
. "github.com/onsi/gomega"
2424
"k8s.io/client-go/kubernetes"
2525
"k8s.io/client-go/kubernetes/scheme"

‎pkg/client/client_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"sync/atomic"
2323
"time"
2424

25-
. "github.com/onsi/ginkgo"
25+
. "github.com/onsi/ginkgo/v2"
2626
. "github.com/onsi/gomega"
2727
appsv1 "k8s.io/api/apps/v1"
2828
corev1 "k8s.io/api/core/v1"

‎pkg/client/config/config_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package config
1919
import (
2020
"testing"
2121

22-
. "github.com/onsi/ginkgo"
22+
. "github.com/onsi/ginkgo/v2"
2323
. "github.com/onsi/gomega"
2424

2525
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"

‎pkg/client/config/config_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"path/filepath"
2323
"strings"
2424

25-
. "github.com/onsi/ginkgo"
25+
. "github.com/onsi/ginkgo/v2"
2626
. "github.com/onsi/gomega"
2727
"k8s.io/client-go/rest"
2828
"k8s.io/client-go/tools/clientcmd"

‎pkg/client/dryrun_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"fmt"
2222
"sync/atomic"
2323

24-
. "github.com/onsi/ginkgo"
24+
. "github.com/onsi/ginkgo/v2"
2525
. "github.com/onsi/gomega"
2626
appsv1 "k8s.io/api/apps/v1"
2727
corev1 "k8s.io/api/core/v1"

‎pkg/client/fake/client_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package fake
1919
import (
2020
"testing"
2121

22-
. "github.com/onsi/ginkgo"
22+
. "github.com/onsi/ginkgo/v2"
2323
. "github.com/onsi/gomega"
2424
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
2525

‎pkg/client/fake/client_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"fmt"
2323
"time"
2424

25-
. "github.com/onsi/ginkgo"
25+
. "github.com/onsi/ginkgo/v2"
2626
. "github.com/onsi/gomega"
2727
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
2828

‎pkg/client/namespaced_client_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"fmt"
2323
"sync/atomic"
2424

25-
. "github.com/onsi/ginkgo"
25+
. "github.com/onsi/ginkgo/v2"
2626
. "github.com/onsi/gomega"
2727

2828
rbacv1 "k8s.io/api/rbac/v1"

‎pkg/client/options_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package client_test
1818

1919
import (
20-
. "github.com/onsi/ginkgo"
20+
. "github.com/onsi/ginkgo/v2"
2121
. "github.com/onsi/gomega"
2222

2323
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

‎pkg/client/watch_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"fmt"
2222
"sync/atomic"
2323

24-
. "github.com/onsi/ginkgo"
24+
. "github.com/onsi/ginkgo/v2"
2525
. "github.com/onsi/gomega"
2626
appsv1 "k8s.io/api/apps/v1"
2727
corev1 "k8s.io/api/core/v1"

‎pkg/cluster/cluster_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"net/http"
2121
"testing"
2222

23-
. "github.com/onsi/ginkgo"
23+
. "github.com/onsi/ginkgo/v2"
2424
. "github.com/onsi/gomega"
2525
"k8s.io/client-go/kubernetes"
2626
"k8s.io/client-go/rest"

‎pkg/cluster/cluster_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"fmt"
2323

2424
"github.com/go-logr/logr"
25-
. "github.com/onsi/ginkgo"
25+
. "github.com/onsi/ginkgo/v2"
2626
. "github.com/onsi/gomega"
2727
"go.uber.org/goleak"
2828
"k8s.io/apimachinery/pkg/api/meta"

‎pkg/config/config_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package config_test
1919
import (
2020
"testing"
2121

22-
. "github.com/onsi/ginkgo"
22+
. "github.com/onsi/ginkgo/v2"
2323
. "github.com/onsi/gomega"
2424

2525
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"

‎pkg/config/config_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package config_test
1818

1919
import (
20-
. "github.com/onsi/ginkgo"
20+
. "github.com/onsi/ginkgo/v2"
2121
. "github.com/onsi/gomega"
2222
"sigs.k8s.io/controller-runtime/pkg/config"
2323
"sigs.k8s.io/controller-runtime/pkg/config/v1alpha1"

‎pkg/controller/controller_integration_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3232
"sigs.k8s.io/controller-runtime/pkg/source"
3333

34-
. "github.com/onsi/ginkgo"
34+
. "github.com/onsi/ginkgo/v2"
3535
. "github.com/onsi/gomega"
3636
"sigs.k8s.io/controller-runtime/pkg/manager"
3737
)

‎pkg/controller/controller_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"net/http"
2121
"testing"
2222

23-
. "github.com/onsi/ginkgo"
23+
. "github.com/onsi/ginkgo/v2"
2424
. "github.com/onsi/gomega"
2525
"k8s.io/apimachinery/pkg/runtime/schema"
2626
"k8s.io/client-go/kubernetes"

‎pkg/controller/controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"fmt"
2222
"time"
2323

24-
. "github.com/onsi/ginkgo"
24+
. "github.com/onsi/ginkgo/v2"
2525
. "github.com/onsi/gomega"
2626
"go.uber.org/goleak"
2727
corev1 "k8s.io/api/core/v1"

‎pkg/controller/controllerutil/controllerutil_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package controllerutil_test
1919
import (
2020
"testing"
2121

22-
. "github.com/onsi/ginkgo"
22+
. "github.com/onsi/ginkgo/v2"
2323
. "github.com/onsi/gomega"
2424

2525
"k8s.io/client-go/rest"

‎pkg/controller/controllerutil/controllerutil_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"fmt"
2222
"math/rand"
2323

24-
. "github.com/onsi/ginkgo"
24+
. "github.com/onsi/ginkgo/v2"
2525
. "github.com/onsi/gomega"
2626
appsv1 "k8s.io/api/apps/v1"
2727
corev1 "k8s.io/api/core/v1"

‎pkg/envtest/envtest_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package envtest
1919
import (
2020
"testing"
2121

22-
. "github.com/onsi/ginkgo"
22+
. "github.com/onsi/ginkgo/v2"
2323
. "github.com/onsi/gomega"
2424
admissionv1 "k8s.io/api/admissionregistration/v1"
2525
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

‎pkg/envtest/envtest_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"path/filepath"
2222
"time"
2323

24-
. "github.com/onsi/ginkgo"
24+
. "github.com/onsi/ginkgo/v2"
2525
. "github.com/onsi/gomega"
2626
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
2727
apierrors "k8s.io/apimachinery/pkg/api/errors"

‎pkg/envtest/printer/ginkgo.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ package printer
2121
import (
2222
"fmt"
2323

24-
"github.com/onsi/ginkgo"
2524
"github.com/onsi/ginkgo/config"
2625
"github.com/onsi/ginkgo/types"
26+
"github.com/onsi/ginkgo/v2"
2727
)
2828

2929
var _ ginkgo.Reporter = NewlineReporter{}

‎pkg/envtest/printer/prow.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ import (
2222
"path/filepath"
2323
"sync"
2424

25-
"github.com/onsi/ginkgo"
2625
"github.com/onsi/ginkgo/config"
2726
"github.com/onsi/ginkgo/reporters"
2827
"github.com/onsi/ginkgo/types"
28+
"github.com/onsi/ginkgo/v2"
2929

3030
"k8s.io/apimachinery/pkg/util/sets"
3131
)

‎pkg/envtest/webhook_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"path/filepath"
2222
"time"
2323

24-
. "github.com/onsi/ginkgo"
24+
. "github.com/onsi/ginkgo/v2"
2525
. "github.com/onsi/gomega"
2626
appsv1 "k8s.io/api/apps/v1"
2727
corev1 "k8s.io/api/core/v1"

‎pkg/finalizer/finalizer_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66
"testing"
77

8-
. "github.com/onsi/ginkgo"
8+
. "github.com/onsi/ginkgo/v2"
99
. "github.com/onsi/gomega"
1010
corev1 "k8s.io/api/core/v1"
1111
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

‎pkg/handler/eventhandler_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package handler_test
1919
import (
2020
"testing"
2121

22-
. "github.com/onsi/ginkgo"
22+
. "github.com/onsi/ginkgo/v2"
2323
. "github.com/onsi/gomega"
2424
"k8s.io/client-go/rest"
2525
"sigs.k8s.io/controller-runtime/pkg/envtest"

‎pkg/handler/eventhandler_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package handler_test
1818

1919
import (
20-
. "github.com/onsi/ginkgo"
20+
. "github.com/onsi/ginkgo/v2"
2121
. "github.com/onsi/gomega"
2222
appsv1 "k8s.io/api/apps/v1"
2323
autoscalingv1 "k8s.io/api/autoscaling/v1"

‎pkg/healthz/healthz_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package healthz_test
1919
import (
2020
"testing"
2121

22-
. "github.com/onsi/ginkgo"
22+
. "github.com/onsi/ginkgo/v2"
2323
. "github.com/onsi/gomega"
2424
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
2525
logf "sigs.k8s.io/controller-runtime/pkg/log"

‎pkg/healthz/healthz_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"net/http"
2222
"net/http/httptest"
2323

24-
. "github.com/onsi/ginkgo"
24+
. "github.com/onsi/ginkgo/v2"
2525
. "github.com/onsi/gomega"
2626
"sigs.k8s.io/controller-runtime/pkg/healthz"
2727
)

‎pkg/internal/controller/controller_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package controller
1919
import (
2020
"testing"
2121

22-
. "github.com/onsi/ginkgo"
22+
. "github.com/onsi/ginkgo/v2"
2323
. "github.com/onsi/gomega"
2424
"k8s.io/client-go/kubernetes"
2525
"k8s.io/client-go/rest"

‎pkg/internal/controller/controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"sync"
2424
"time"
2525

26-
. "github.com/onsi/ginkgo"
26+
. "github.com/onsi/ginkgo/v2"
2727
. "github.com/onsi/gomega"
2828
"github.com/prometheus/client_golang/prometheus"
2929
dto "github.com/prometheus/client_model/go"

‎pkg/internal/recorder/recorder_integration_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3232
"sigs.k8s.io/controller-runtime/pkg/source"
3333

34-
. "github.com/onsi/ginkgo"
34+
. "github.com/onsi/ginkgo/v2"
3535
. "github.com/onsi/gomega"
3636
)
3737

0 commit comments

Comments
 (0)