Merge pull request #618 from ialidzhikov/cleanup/dependency

Remove dependency to k8s.io/kubernetes

go.mod

@@ -39,62 +39,25 @@ require (
 	k8s.io/csi-translation-lib v0.21.0
 	k8s.io/klog/v2 v2.8.0
 	k8s.io/kube-openapi v0.0.0-20210305164622-f622666832c1 // indirect
-	k8s.io/kubernetes v1.21.0
 	k8s.io/utils v0.0.0-20210305010621-2afb4311ab10 // indirect
 	sigs.k8s.io/controller-runtime v0.8.3
 	sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.3.0
 )
 
-replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.0
-
-replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.0
-
-replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.21.0
-
-replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.21.0
-
-replace k8s.io/code-generator => k8s.io/code-generator v0.21.0
-
-replace k8s.io/cri-api => k8s.io/cri-api v0.21.0
-
-replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.21.0
-
-replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.21.0
-
-replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.21.0
-
-replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.21.0
-
-replace k8s.io/kubectl => k8s.io/kubectl v0.21.0
-
-replace k8s.io/kubelet => k8s.io/kubelet v0.21.0
-
-replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.21.0
-
-replace k8s.io/metrics => k8s.io/metrics v0.21.0
-
-replace k8s.io/node-api => k8s.io/node-api v0.21.0
-
-replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.21.0
-
-replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.21.0
-
-replace k8s.io/sample-controller => k8s.io/sample-controller v0.21.0
-
 replace k8s.io/api => k8s.io/api v0.21.0
 
+replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.0
+
 replace k8s.io/apimachinery => k8s.io/apimachinery v0.21.0
 
 replace k8s.io/apiserver => k8s.io/apiserver v0.21.0
 
 replace k8s.io/client-go => k8s.io/client-go v0.21.0
 
-replace k8s.io/component-base => k8s.io/component-base v0.21.0
-
-replace k8s.io/controller-manager => k8s.io/controller-manager v0.21.0
+replace k8s.io/code-generator => k8s.io/code-generator v0.21.0
 
-replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.21.0
+replace k8s.io/component-base => k8s.io/component-base v0.21.0
 
 replace k8s.io/component-helpers => k8s.io/component-helpers v0.21.0
 
-replace k8s.io/mount-utils => k8s.io/mount-utils v0.21.0
+replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.21.0

pkg/controller/topology_test.go

@@ -23,13 +23,13 @@ import (
 	"github.com/container-storage-interface/spec/lib/go/csi"
 	v1 "k8s.io/api/core/v1"
 	storagev1 "k8s.io/api/storage/v1"
+	"k8s.io/apimachinery/pkg/api/equality"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/client-go/informers"
 	fakeclientset "k8s.io/client-go/kubernetes/fake"
 	corelisters "k8s.io/client-go/listers/core/v1"
 	storagelistersv1 "k8s.io/client-go/listers/storage/v1"
-	"k8s.io/kubernetes/pkg/apis/core/helper"
 )
 
 const (
@@ -434,7 +434,7 @@ func TestStatefulSetSpreading(t *testing.T) {
 							if expected != nil && requirements.Preferred == nil {
 								t.Fatalf("expected preferred to be %v but requirements.Preferred is nil", expected)
 							}
-							if expected != nil && !helper.Semantic.DeepEqual(requirements.Preferred, expected) {
+							if expected != nil && !equality.Semantic.DeepEqual(requirements.Preferred, expected) {
 								t.Errorf("expected preferred requisite %v; got: %v", expected, requirements.Preferred)
 							}
 						})
@@ -1441,7 +1441,7 @@ func TestPreferredTopologies(t *testing.T) {
 								if requirements == nil {
 									t.Fatalf("expected preferred to be %v but requirements is nil", expectedPreferred)
 								}
-								if !helper.Semantic.DeepEqual(requirements.Preferred, expectedPreferred) {
+								if !equality.Semantic.DeepEqual(requirements.Preferred, expectedPreferred) {
 									t.Errorf("expected requisite %v; got: %v", tc.expectedPreferred, requirements.Preferred)
 								}
 							}
@@ -1603,7 +1603,7 @@ func requisiteEqual(t1, t2 []*csi.Topology) bool {
 	for _, topology := range t2 {
 		found := false
 		for i := range unchecked {
-			if helper.Semantic.DeepEqual(t1[i], topology) {
+			if equality.Semantic.DeepEqual(t1[i], topology) {
 				found = true
 				unchecked.Delete(i)
 				break