Skip to content

Commit

Permalink
Merge pull request #320 from jiridanek/jd_fix_wrong_merge
Browse files Browse the repository at this point in the history
Fix wrong imports in tests on stable branch caused by cherry-picking mistakes
  • Loading branch information
harshad16 authored May 10, 2024
2 parents e0bc959 + b672c65 commit a5c807f
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,13 @@ import (
"time"

"github.com/go-logr/logr"
"github.com/onsi/gomega/format"
netv1 "k8s.io/api/networking/v1"
"k8s.io/apimachinery/pkg/api/resource"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
routev1 "github.com/openshift/api/route/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/intstr"
Expand Down
2 changes: 0 additions & 2 deletions components/odh-notebook-controller/controllers/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ import (
"testing"
"time"

v1 "k8s.io/api/core/v1"
netv1 "k8s.io/api/networking/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"go.uber.org/zap/zapcore"
"k8s.io/apimachinery/pkg/runtime"
Expand Down

0 comments on commit a5c807f

Please sign in to comment.