Merge pull request #11 from ncdc/kcp-fix-envtest

UPSTREAM: <carry>: make pkg/envtest compile

Author: fabianvf

pkg/envtest/crd.go

@@ -32,6 +32,7 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/util/wait"
 	k8syaml "k8s.io/apimachinery/pkg/util/yaml"
@@ -252,7 +253,7 @@ func CreateCRDs(config *rest.Config, crds []*apiextensionsv1.CustomResourceDefin
 		crd := crd
 		log.V(1).Info("installing CRD", "crd", crd.GetName())
 		existingCrd := crd.DeepCopy()
-		err := cs.Get(context.TODO(), client.ObjectKey{Name: crd.GetName()}, existingCrd)
+		err := cs.Get(context.TODO(), client.ObjectKey{NamespacedName: types.NamespacedName{Name: crd.GetName()}}, existingCrd)
 		switch {
 		case apierrors.IsNotFound(err):
 			if err := cs.Create(context.TODO(), crd); err != nil {
@@ -263,7 +264,7 @@ func CreateCRDs(config *rest.Config, crds []*apiextensionsv1.CustomResourceDefin
 		default:
 			log.V(1).Info("CRD already exists, updating", "crd", crd.GetName())
 			if err := retry.RetryOnConflict(retry.DefaultBackoff, func() error {
-				if err := cs.Get(context.TODO(), client.ObjectKey{Name: crd.GetName()}, existingCrd); err != nil {
+				if err := cs.Get(context.TODO(), client.ObjectKey{NamespacedName: types.NamespacedName{Name: crd.GetName()}}, existingCrd); err != nil {
 					return err
 				}
 				crd.SetResourceVersion(existingCrd.GetResourceVersion())

pkg/envtest/webhook.go

@@ -27,6 +27,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/kubernetes/scheme"
@@ -234,8 +235,10 @@ func (p *webhookPoller) poll() (done bool, err error) {
 			var obj = &unstructured.Unstructured{}
 			obj.SetGroupVersionKind(gvk)
 			err := c.Get(context.Background(), client.ObjectKey{
-				Namespace: "",
-				Name:      name,
+				NamespacedName: types.NamespacedName{
+					Namespace: "",
+					Name:      name,
+				},
 			}, obj)
 
 			if err == nil {
@@ -315,7 +318,7 @@ func createWebhooks(config *rest.Config, mutHooks []*admissionv1.MutatingWebhook
 // ensureCreated creates or update object if already exists in the cluster.
 func ensureCreated(cs client.Client, obj client.Object) error {
 	existing := obj.DeepCopyObject().(client.Object)
-	err := cs.Get(context.Background(), client.ObjectKey{Name: obj.GetName()}, existing)
+	err := cs.Get(context.Background(), client.ObjectKey{NamespacedName: types.NamespacedName{Name: obj.GetName()}}, existing)
 	switch {
 	case apierrors.IsNotFound(err):
 		if err := cs.Create(context.Background(), obj); err != nil {