Merge pull request #646 from mythi/PR-2021-033

move to k8s.io v1.21.1 and controller-runtime v0.9.0

Author: rojkov

README.md

@@ -36,7 +36,7 @@ Prerequisites for building and running these device plugins include:
 
 - Appropriate hardware
 - A fully configured [Kubernetes cluster]
-- A working [Go environment], of at least version v1.15.
+- A working [Go environment], of at least version v1.16.
 
 ## Plugins
 

go.mod

@@ -7,34 +7,29 @@ require (
 	github.com/go-ini/ini v1.62.0
 	github.com/go-logr/logr v0.4.0
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/google/go-cmp v0.5.6 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/gousb v1.1.0
 	github.com/google/uuid v1.2.0 // indirect
-	github.com/imdario/mergo v0.3.12 // indirect
-	github.com/klauspost/cpuid/v2 v2.0.2
-	github.com/onsi/ginkgo v1.15.0
-	github.com/onsi/gomega v1.10.5
+	github.com/klauspost/cpuid/v2 v2.0.6
+	github.com/onsi/ginkgo v1.16.4
+	github.com/onsi/gomega v1.13.0
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.10.0 // indirect
-	github.com/prometheus/common v0.20.0 // indirect
-	golang.org/x/net v0.0.0-20210415231046-e915ea6b2b7d // indirect
-	golang.org/x/oauth2 v0.0.0-20210413134643-5e61552d6c78 // indirect
-	golang.org/x/sys v0.0.0-20210415045647-66c3f260301c
-	golang.org/x/term v0.0.0-20210406210042-72f3dc4e9b72 // indirect
+	github.com/prometheus/common v0.28.0 // indirect
+	golang.org/x/sys v0.0.0-20210608053332-aa57babbf139
+	golang.org/x/term v0.0.0-20210503060354-a79de5458b56 // indirect
+	golang.org/x/time v0.0.0-20210608053304-ed9ce3a009e4 // indirect
 	google.golang.org/grpc v1.31.0
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
-	k8s.io/api v0.21.0
-	k8s.io/apiextensions-apiserver v0.21.0 // indirect
-	k8s.io/apimachinery v0.21.0
-	k8s.io/client-go v1.5.2
-	k8s.io/component-base v0.21.0
-	k8s.io/klog/v2 v2.8.0
-	k8s.io/kube-openapi v0.0.0-20210323165736-1a6458611d18 // indirect
-	k8s.io/kubelet v0.21.0
-	k8s.io/kubernetes v1.21.0
-	k8s.io/utils v0.0.0-20210305010621-2afb4311ab10
-	sigs.k8s.io/controller-runtime v0.9.0-alpha.1
+	k8s.io/api v0.21.1
+	k8s.io/apimachinery v0.21.1
+	k8s.io/client-go v0.21.1
+	k8s.io/component-base v0.21.1
+	k8s.io/klog/v2 v2.9.0
+	k8s.io/kube-openapi v0.0.0-20210527164424-3c818078ee3d // indirect
+	k8s.io/kubelet v0.21.1
+	k8s.io/kubernetes v1.21.1
+	k8s.io/utils v0.0.0-20210527160623-6fdb442a123b
+	sigs.k8s.io/controller-runtime v0.9.0
 	sigs.k8s.io/structured-merge-diff/v4 v4.1.1 // indirect
 )
 

go.sum

@@ -31,6 +31,11 @@ var _ = Describe("DsaDevicePlugin Controller", func() {
 	const timeout = time.Second * 30
 	const interval = time.Second * 1
 
+	AfterEach(func() {
+		time.Sleep(time.Second * 2)
+
+	})
+
 	Context("Basic CRUD operations", func() {
 		It("should handle DsaDevicePlugin objects correctly", func() {
 			spec := devicepluginv1.DsaDevicePluginSpec{

test/envtest/dsadeviceplugin_controller_test.go

@@ -31,6 +31,11 @@ var _ = Describe("FpgaDevicePlugin Controller", func() {
 	const timeout = time.Second * 30
 	const interval = time.Second * 1
 
+	AfterEach(func() {
+		time.Sleep(time.Second * 2)
+
+	})
+
 	Context("Basic CRUD operations", func() {
 		It("should handle FpgaDevicePlugin objects correctly", func() {
 			spec := devicepluginv1.FpgaDevicePluginSpec{

test/envtest/fpgadeviceplugin_controller_test.go

@@ -31,6 +31,11 @@ var _ = Describe("GpuDevicePlugin Controller", func() {
 	const timeout = time.Second * 30
 	const interval = time.Second * 1
 
+	AfterEach(func() {
+		time.Sleep(time.Second * 2)
+
+	})
+
 	Context("Basic CRUD operations", func() {
 		It("should handle GpuDevicePlugin objects correctly", func() {
 			spec := devicepluginv1.GpuDevicePluginSpec{

test/envtest/gpudeviceplugin_controller_test.go

@@ -31,6 +31,11 @@ var _ = Describe("QatDevicePlugin Controller", func() {
 	const timeout = time.Second * 30
 	const interval = time.Second * 1
 
+	AfterEach(func() {
+		time.Sleep(time.Second * 2)
+
+	})
+
 	Context("Basic CRUD operations", func() {
 		It("should handle QatDevicePlugin objects correctly", func() {
 			spec := devicepluginv1.QatDevicePluginSpec{

test/envtest/qatdeviceplugin_controller_test.go

@@ -31,6 +31,11 @@ var _ = Describe("SgxDevicePlugin Controller", func() {
 	const timeout = time.Second * 30
 	const interval = time.Second * 1
 
+	AfterEach(func() {
+		time.Sleep(time.Second * 2)
+
+	})
+
 	Context("Basic CRUD operations", func() {
 		It("should handle SgxDevicePlugin objects correctly", func() {
 			spec := devicepluginv1.SgxDevicePluginSpec{

test/envtest/sgxdeviceplugin_controller_test.go

@@ -27,7 +27,6 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
-	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 
 	devicepluginv1 "github.com/intel/intel-device-plugins-for-kubernetes/pkg/apis/deviceplugin/v1"
@@ -49,12 +48,11 @@ var testEnv *envtest.Environment
 func TestAPIs(t *testing.T) {
 	RegisterFailHandler(Fail)
 
-	RunSpecsWithDefaultAndCustomReporters(t,
-		"Controller Suite",
-		[]Reporter{printer.NewlineReporter{}})
+	RunSpecs(t,
+		"Controller Suite")
 }
 
-var _ = BeforeSuite(func(done Done) {
+var _ = BeforeSuite(func() {
 	logf.SetLogger(klogr.New())
 
 	By("bootstrapping test environment")
@@ -98,7 +96,6 @@ var _ = BeforeSuite(func(done Done) {
 	k8sClient = k8sManager.GetClient()
 	Expect(k8sClient).ToNot(BeNil())
 
-	close(done)
 }, 60)
 
 var _ = AfterSuite(func() {