feat: cleanup go mod & use volcano/apis

cmd/tf-operator.v1/app/server.go

@@ -35,7 +35,7 @@ import (
 	election "k8s.io/client-go/tools/leaderelection"
 	"k8s.io/client-go/tools/leaderelection/resourcelock"
 	"k8s.io/client-go/tools/record"
-	volcanoclient "volcano.sh/volcano/pkg/client/clientset/versioned"
+	volcanoclient "volcano.sh/apis/pkg/client/clientset/versioned"
 
 	"github.com/kubeflow/common/pkg/util/signals"
 	"github.com/kubeflow/tf-operator/cmd/tf-operator.v1/app/options"

go.mod

@@ -3,55 +3,28 @@ module github.com/kubeflow/tf-operator
 go 1.14
 
 require (
-	github.com/coreos/etcd v3.3.20+incompatible // indirect
-	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
 	github.com/go-openapi/spec v0.19.2
-	github.com/golang/protobuf v1.3.2 // indirect
 	github.com/google/go-cmp v0.4.1 // indirect
-	github.com/grpc-ecosystem/grpc-gateway v1.5.0 // indirect
-	github.com/kubeflow/common v0.3.3-0.20210227095238-97658773cce1
+	github.com/kubeflow/common v0.3.3
 	github.com/onrik/logrus v0.2.2-0.20181225141908-a09d5cdcdc62
-	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.5.1
 	github.com/sirupsen/logrus v1.4.2
-	github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect
-	go.uber.org/atomic v1.4.0 // indirect
 	golang.org/x/tools v0.0.0-20200401192744-099440627f01 // indirect
-	k8s.io/api v0.16.9
+	k8s.io/api v0.16.15
 	k8s.io/apiextensions-apiserver v0.16.9
-	k8s.io/apimachinery v0.16.10-beta.0
-	k8s.io/client-go v0.16.9
-	k8s.io/code-generator v0.16.9
-	k8s.io/component-base v0.18.2 // indirect
+	k8s.io/apimachinery v0.16.15
+	k8s.io/client-go v0.16.15
+	k8s.io/code-generator v0.16.15
 	k8s.io/klog v1.0.0
 	k8s.io/kube-openapi v0.0.0-20200410163147-594e756bea31
 	sigs.k8s.io/yaml v1.2.0 // indirect
-	volcano.sh/volcano v0.4.0
+	volcano.sh/apis v1.2.0-k8s1.16.15
 )
 
 replace (
 	k8s.io/api => k8s.io/api v0.16.9
 	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.16.9
 	k8s.io/apimachinery => k8s.io/apimachinery v0.16.10-beta.0
-	k8s.io/apiserver => k8s.io/apiserver v0.16.9
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.16.9
 	k8s.io/client-go => k8s.io/client-go v0.16.9
-	k8s.io/cloud-provider => k8s.io/cloud-provider v0.16.9
-	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.16.9
 	k8s.io/code-generator => k8s.io/code-generator v0.16.10-beta.0
-	k8s.io/component-base => k8s.io/component-base v0.16.9
-	k8s.io/cri-api => k8s.io/cri-api v0.16.10-beta.0
-	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.16.9
-	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.16.9
-	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.16.9
-	k8s.io/kube-proxy => k8s.io/kube-proxy v0.16.9
-	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.16.9
-	k8s.io/kubectl => k8s.io/kubectl v0.16.9
-	k8s.io/kubelet => k8s.io/kubelet v0.16.9
-	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.16.9
-	k8s.io/metrics => k8s.io/metrics v0.16.9
-	k8s.io/node-api => k8s.io/node-api v0.16.9
-	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.16.9
-	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.16.9
-	k8s.io/sample-controller => k8s.io/sample-controller v0.16.9
 )

pkg/controller.v1/tensorflow/controller.go

@@ -43,7 +43,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	volcanoclient "volcano.sh/volcano/pkg/client/clientset/versioned"
+	volcanoclient "volcano.sh/apis/pkg/client/clientset/versioned"
 )
 
 const (

pkg/controller.v1/tensorflow/controller_test.go

@@ -24,8 +24,8 @@ import (
 	kubeinformers "k8s.io/client-go/informers"
 	kubeclientset "k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
-	batchv1beta1 "volcano.sh/volcano/pkg/apis/scheduling/v1beta1"
-	volcanoclient "volcano.sh/volcano/pkg/client/clientset/versioned"
+	batchv1beta1 "volcano.sh/apis/pkg/apis/scheduling/v1beta1"
+	volcanoclient "volcano.sh/apis/pkg/client/clientset/versioned"
 
 	commonv1 "github.com/kubeflow/common/pkg/apis/common/v1"
 	"github.com/kubeflow/common/pkg/controller.v1/control"

pkg/controller.v1/tensorflow/job_test.go

@@ -23,8 +23,8 @@ import (
 	kubeclientset "k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/record"
-	batchv1beta1 "volcano.sh/volcano/pkg/apis/scheduling/v1beta1"
-	volcanoclient "volcano.sh/volcano/pkg/client/clientset/versioned"
+	batchv1beta1 "volcano.sh/apis/pkg/apis/scheduling/v1beta1"
+	volcanoclient "volcano.sh/apis/pkg/client/clientset/versioned"
 
 	common "github.com/kubeflow/common/pkg/apis/common/v1"
 	"github.com/kubeflow/common/pkg/controller.v1/control"

pkg/controller.v1/tensorflow/pod_test.go

@@ -25,8 +25,8 @@ import (
 	kubeclientset "k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/record"
-	batchv1beta1 "volcano.sh/volcano/pkg/apis/scheduling/v1beta1"
-	volcanoclient "volcano.sh/volcano/pkg/client/clientset/versioned"
+	batchv1beta1 "volcano.sh/apis/pkg/apis/scheduling/v1beta1"
+	volcanoclient "volcano.sh/apis/pkg/client/clientset/versioned"
 
 	commonv1 "github.com/kubeflow/common/pkg/apis/common/v1"
 	"github.com/kubeflow/common/pkg/controller.v1/common"

pkg/controller.v1/tensorflow/status_test.go

@@ -26,8 +26,8 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/tools/record"
 
-	batchv1beta1 "volcano.sh/volcano/pkg/apis/scheduling/v1beta1"
-	volcanoclient "volcano.sh/volcano/pkg/client/clientset/versioned"
+	batchv1beta1 "volcano.sh/apis/pkg/apis/scheduling/v1beta1"
+	volcanoclient "volcano.sh/apis/pkg/client/clientset/versioned"
 
 	commonv1 "github.com/kubeflow/common/pkg/apis/common/v1"
 	"github.com/kubeflow/common/pkg/controller.v1/control"