Revert "Upgrading controller-runtime is test dir (#1582)" (#1648)

This reverts commit c0714e4.

test/framework/framework.go

@@ -63,11 +63,14 @@ func New(options Options) *Framework {
 	realClient, err := client.New(config, client.Options{Scheme: k8sSchema})
 	Expect(err).NotTo(HaveOccurred())
 
-	k8sClient, err := client.NewDelegatingClient(client.NewDelegatingClientInput{
-		CacheReader: cache,
-		Client:      realClient,
-	})
-	Expect(err).NotTo(HaveOccurred())
+	k8sClient := client.DelegatingClient{
+		Reader: &client.DelegatingReader{
+			CacheReader:  cache,
+			ClientReader: realClient,
+		},
+		Writer:       realClient,
+		StatusClient: realClient,
+	}
 
 	cloudConfig := aws.CloudConfig{Region: options.AWSRegion, VpcID: options.AWSVPCID,
 		EKSEndpoint: options.EKSEndpoint}

test/framework/resources/k8s/manager.go

@@ -45,7 +45,7 @@ type defaultManager struct {
 	configMapManager      resources.ConfigMapManager
 }
 
-func NewResourceManager(k8sClient client.Client,
+func NewResourceManager(k8sClient client.DelegatingClient,
 	scheme *runtime.Scheme, config *rest.Config) ResourceManagers {
 	return &defaultManager{
 		jobManager:            resources.NewDefaultJobManager(k8sClient),

test/framework/resources/k8s/resources/configmap.go

@@ -27,7 +27,7 @@ type ConfigMapManager interface {
 }
 
 type defaultConfigMapManager struct {
-	k8sClient client.Client
+	k8sClient client.DelegatingClient
 }
 
 func (d defaultConfigMapManager) GetConfigMap(namespace string, name string) (*v1.ConfigMap, error) {
@@ -41,6 +41,6 @@ func (d defaultConfigMapManager) UpdateConfigMap(oldConfigMap *v1.ConfigMap, new
 	return d.k8sClient.Patch(ctx, newConfigMap, client.MergeFrom(oldConfigMap))
 }
 
-func NewConfigMapManager(k8sClient client.Client) ConfigMapManager {
+func NewConfigMapManager(k8sClient client.DelegatingClient) ConfigMapManager {
 	return &defaultConfigMapManager{k8sClient: k8sClient}
 }

test/framework/resources/k8s/resources/daemonset.go

@@ -29,10 +29,10 @@ type DaemonSetManager interface {
 }
 
 type defaultDaemonSetManager struct {
-	k8sClient client.Client
+	k8sClient client.DelegatingClient
 }
 
-func NewDefaultDaemonSetManager(k8sClient client.Client) DaemonSetManager {
+func NewDefaultDaemonSetManager(k8sClient client.DelegatingClient) DaemonSetManager {
 	return &defaultDaemonSetManager{k8sClient: k8sClient}
 }
 

test/framework/resources/k8s/resources/deployment.go

@@ -31,7 +31,7 @@ type DeploymentManager interface {
 }
 
 type defaultDeploymentManager struct {
-	k8sClient client.Client
+	k8sClient client.DelegatingClient
 }
 
 // CreateAndWaitTillDeploymentIsReady creates and waits for deployment to become ready or timeout
@@ -80,6 +80,6 @@ func (d defaultDeploymentManager) DeleteAndWaitTillDeploymentIsDeleted(deploymen
 	}, ctx.Done())
 }
 
-func NewDefaultDeploymentManager(k8sClient client.Client) DeploymentManager {
+func NewDefaultDeploymentManager(k8sClient client.DelegatingClient) DeploymentManager {
 	return &defaultDeploymentManager{k8sClient: k8sClient}
 }

test/framework/resources/k8s/resources/eniconfig.go

@@ -16,28 +16,29 @@ package resources
 import (
 	"context"
 
+	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 type CustomResourceManager interface {
-	CreateResource(resource client.Object) error
-	DeleteResource(resource client.Object) error
+	CreateResource(resource runtime.Object) error
+	DeleteResource(resource runtime.Object) error
 }
 
 type defaultCustomResourceManager struct {
-	k8sClient client.Client
+	k8sClient client.DelegatingClient
 }
 
-func NewCustomResourceManager(k8sClient client.Client) CustomResourceManager {
+func NewCustomResourceManager(k8sClient client.DelegatingClient) CustomResourceManager {
 	return &defaultCustomResourceManager{k8sClient: k8sClient}
 }
 
-func (d *defaultCustomResourceManager) CreateResource(resource client.Object) error {
+func (d *defaultCustomResourceManager) CreateResource(resource runtime.Object) error {
 	ctx := context.Background()
 	return d.k8sClient.Create(ctx, resource)
 }
 
-func (d *defaultCustomResourceManager) DeleteResource(resource client.Object) error {
+func (d *defaultCustomResourceManager) DeleteResource(resource runtime.Object) error {
 	ctx := context.Background()
 	return d.k8sClient.Delete(ctx, resource)
 }

test/framework/resources/k8s/resources/job.go

@@ -32,10 +32,10 @@ type JobManager interface {
 }
 
 type defaultJobManager struct {
-	k8sClient client.Client
+	k8sClient client.DelegatingClient
 }
 
-func NewDefaultJobManager(k8sClient client.Client) JobManager {
+func NewDefaultJobManager(k8sClient client.DelegatingClient) JobManager {
 	return &defaultJobManager{k8sClient: k8sClient}
 }
 

test/framework/resources/k8s/resources/namespace.go

@@ -31,10 +31,10 @@ type NamespaceManager interface {
 }
 
 type defaultNamespaceManager struct {
-	k8sClient client.Client
+	k8sClient client.DelegatingClient
 }
 
-func NewDefaultNamespaceManager(k8sClient client.Client) NamespaceManager {
+func NewDefaultNamespaceManager(k8sClient client.DelegatingClient) NamespaceManager {
 	return &defaultNamespaceManager{k8sClient: k8sClient}
 }
 

test/framework/resources/k8s/resources/node.go

@@ -31,10 +31,10 @@ type NodeManager interface {
 }
 
 type defaultNodeManager struct {
-	k8sClient client.Client
+	k8sClient client.DelegatingClient
 }
 
-func NewDefaultNodeManager(k8sClient client.Client) NodeManager {
+func NewDefaultNodeManager(k8sClient client.DelegatingClient) NodeManager {
 	return &defaultNodeManager{k8sClient: k8sClient}
 }
 

test/framework/resources/k8s/resources/pod.go

@@ -45,12 +45,12 @@ type PodManager interface {
 }
 
 type defaultPodManager struct {
-	k8sClient client.Client
+	k8sClient client.DelegatingClient
 	k8sSchema *runtime.Scheme
 	config    *rest.Config
 }
 
-func NewDefaultPodManager(k8sClient client.Client, k8sSchema *runtime.Scheme,
+func NewDefaultPodManager(k8sClient client.DelegatingClient, k8sSchema *runtime.Scheme,
 	config *rest.Config) PodManager {
 
 	return &defaultPodManager{
@@ -212,5 +212,5 @@ func (d *defaultPodManager) getRestClientForPod(namespace string, name string) (
 	if err != nil {
 		return nil, err
 	}
-	return apiutil.RESTClientForGVK(gkv, false, d.config, serializer.NewCodecFactory(d.k8sSchema))
+	return apiutil.RESTClientForGVK(gkv, d.config, serializer.NewCodecFactory(d.k8sSchema))
 }

test/framework/resources/k8s/resources/service.go

@@ -32,10 +32,10 @@ type ServiceManager interface {
 }
 
 type defaultServiceManager struct {
-	k8sClient client.Client
+	k8sClient client.DelegatingClient
 }
 
-func NewDefaultServiceManager(k8sClient client.Client) ServiceManager {
+func NewDefaultServiceManager(k8sClient client.DelegatingClient) ServiceManager {
 	return &defaultServiceManager{k8sClient: k8sClient}
 }
 

test/go.mod

@@ -4,22 +4,20 @@ go 1.14
 
 require (
 	github.com/apparentlymart/go-cidr v1.0.1
-	github.com/aws/amazon-vpc-cni-k8s v1.9.0
+	github.com/aws/amazon-vpc-cni-k8s v1.7.10
 	github.com/aws/amazon-vpc-cni-k8s/test/agent v0.0.0-20210519174950-4d1931b480a2
 	github.com/aws/amazon-vpc-resource-controller-k8s v1.0.7
 	github.com/aws/aws-sdk-go v1.40.6
-	github.com/google/gopacket v1.1.17
-	github.com/onsi/ginkgo v1.16.4
-	github.com/onsi/gomega v1.14.0
+	github.com/onsi/ginkgo v1.12.1
+	github.com/onsi/gomega v1.11.0
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/common v0.26.0
-	github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852
+	github.com/prometheus/common v0.10.0
 	gopkg.in/yaml.v2 v2.4.0
 	helm.sh/helm/v3 v3.6.1
-	k8s.io/api v0.21.3
-	k8s.io/apimachinery v0.21.3
+	k8s.io/api v0.21.0
+	k8s.io/apimachinery v0.21.0
 	k8s.io/cli-runtime v0.21.0
-	k8s.io/client-go v0.21.3
+	k8s.io/client-go v0.21.0
 	rsc.io/letsencrypt v0.0.3 // indirect
-	sigs.k8s.io/controller-runtime v0.9.5
+	sigs.k8s.io/controller-runtime v0.6.3
 )