Skip to content

Commit

Permalink
additional code reorganization fixes
Browse files Browse the repository at this point in the history
Signed-off-by: nicklesimba <[email protected]>
  • Loading branch information
nicklesimba committed Jul 6, 2022
1 parent 1ba8ea9 commit fdb5977
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 120 deletions.
5 changes: 5 additions & 0 deletions cmd/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
. "github.com/onsi/gomega"

whereaboutsv1alpha1 "github.com/k8snetworkplumbingwg/whereabouts/pkg/api/whereabouts.cni.cncf.io/v1alpha1"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/rest"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand All @@ -24,6 +25,7 @@ import (

var cfg *rest.Config
var k8sClient client.Client
var k8sClientSet *kubernetes.Clientset
var testEnv *envtest.Environment
var etcdHost string
var tmpdir string
Expand Down Expand Up @@ -73,6 +75,9 @@ var _ = BeforeSuite(func(done Done) {
Expect(err).ToNot(HaveOccurred())
Expect(k8sClient).ToNot(BeNil())

k8sClientSet, err = kubernetes.NewForConfig(cfg)
Expect(err).NotTo(HaveOccurred())

close(done)
}, 60)

Expand Down
5 changes: 5 additions & 0 deletions pkg/reconciler/ip_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@ import (

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"sigs.k8s.io/controller-runtime/pkg/client"

multusv1 "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1"
"github.com/k8snetworkplumbingwg/whereabouts/pkg/api/whereabouts.cni.cncf.io/v1alpha1"

v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
k8stypes "k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/kubernetes"
)

var _ = Describe("Whereabouts IP reconciler", func() {
Expand All @@ -30,6 +32,9 @@ var _ = Describe("Whereabouts IP reconciler", func() {

var (
reconcileLooper *ReconcileLooper
k8sClient client.Client
k8sClientSet *kubernetes.Clientset
kubeConfigPath string
)

Context("reconciling IP pools with a single running pod", func() {
Expand Down
120 changes: 0 additions & 120 deletions pkg/reconciler/suite_test.go

This file was deleted.

0 comments on commit fdb5977

Please sign in to comment.