Updates for latest api changes

Author: Rob Rati

pkg/controller/bucket/bucket_controller_test.go

@@ -32,6 +32,8 @@ import (
 	utilversion "k8s.io/apimachinery/pkg/util/version"
 	"k8s.io/apimachinery/pkg/version"
 
+	corev1 "k8s.io/api/core/v1"
+
 	fakediscovery "k8s.io/client-go/discovery/fake"
 	fakekubeclientset "k8s.io/client-go/kubernetes/fake"
 
@@ -132,8 +134,8 @@ func TestAddValidProtocols(t *testing.T) {
 				if in.BucketName != bucketName {
 					t.Errorf("expected %s, got %s", bucketName, in.BucketName)
 				}
-				if in.Region != region {
-					t.Errorf("expected %s, got %s", region, in.Region)
+				if in.BucketContext["Region"] != region {
+					t.Errorf("expected %s, got %s", region, in.BucketContext["Region"])
 				}
 				if in.BucketContext["Version"] != protocolVersion {
 					t.Errorf("expected %s, got %s", protocolVersion, in.BucketContext["Version"])
@@ -273,7 +275,7 @@ func TestAddInvalidProtocol(t *testing.T) {
 
 	b := v1alpha1.Bucket{
 		Spec: v1alpha1.BucketSpec{
-			BucketRequest: &v1alpha1.ObjectReference{
+			BucketRequest: &corev1.ObjectReference{
 				Name: bucketName,
 			},
 			Provisioner: provisioner,
@@ -351,8 +353,8 @@ func TestDeleteValidProtocols(t *testing.T) {
 				if in.BucketName != bucketName {
 					t.Errorf("expected %s, got %s", bucketName, in.BucketName)
 				}
-				if in.Region != region {
-					t.Errorf("expected %s, got %s", region, in.Region)
+				if in.BucketContext["Region"] != region {
+					t.Errorf("expected %s, got %s", region, in.BucketContext["Region"])
 				}
 				if in.BucketContext["Version"] != protocolVersion {
 					t.Errorf("expected %s, got %s", protocolVersion, in.BucketContext["Version"])
@@ -466,7 +468,7 @@ func TestDeleteInvalidProtocol(t *testing.T) {
 
 	b := v1alpha1.Bucket{
 		Spec: v1alpha1.BucketSpec{
-			BucketRequest: &v1alpha1.ObjectReference{
+			BucketRequest: &corev1.ObjectReference{
 				Name: bucketName,
 			},
 			Provisioner: provisioner,