Merge pull request #80 from volcano-sh/opt/job_cache

Klaus Ma · web-flow · commit c22aacc627fb · 2019-04-09T11:39:43.000+08:00
Move apis&amp;cache into pkg/controllers folder
diff --git a/hack/.golint_failures b/hack/.golint_failures
@@ -7,9 +7,9 @@ volcano.sh/volcano/pkg/apis/batch/v1alpha1
 volcano.sh/volcano/pkg/apis/bus/v1alpha1
 volcano.sh/volcano/pkg/apis/helpers
 volcano.sh/volcano/pkg/cli/job
+volcano.sh/volcano/pkg/controllers/apis
+volcano.sh/volcano/pkg/controllers/cache
 volcano.sh/volcano/pkg/controllers/job
-volcano.sh/volcano/pkg/controllers/job/apis
-volcano.sh/volcano/pkg/controllers/job/cache
 volcano.sh/volcano/pkg/controllers/job/helpers
 volcano.sh/volcano/pkg/controllers/job/plugins
 volcano.sh/volcano/pkg/controllers/job/plugins/env
diff --git a/pkg/controllers/apis/job_info.go b/pkg/controllers/apis/job_info.go
diff --git a/pkg/controllers/cache/cache.go b/pkg/controllers/cache/cache.go
@@ -26,7 +26,7 @@ import (
 	"k8s.io/client-go/util/workqueue"
 
 	"volcano.sh/volcano/pkg/apis/batch/v1alpha1"
-	"volcano.sh/volcano/pkg/controllers/job/apis"
+	"volcano.sh/volcano/pkg/controllers/apis"
 )
 
 type jobCache struct {
diff --git a/pkg/controllers/cache/interface.go b/pkg/controllers/cache/interface.go
@@ -20,7 +20,7 @@ import (
 	"k8s.io/api/core/v1"
 
 	"volcano.sh/volcano/pkg/apis/batch/v1alpha1"
-	"volcano.sh/volcano/pkg/controllers/job/apis"
+	"volcano.sh/volcano/pkg/controllers/apis"
 )
 
 type Cache interface {
diff --git a/pkg/controllers/job/job_controller.go b/pkg/controllers/job/job_controller.go
@@ -47,8 +47,8 @@ import (
 	vkcoreinfo "volcano.sh/volcano/pkg/client/informers/externalversions/bus/v1alpha1"
 	vkbatchlister "volcano.sh/volcano/pkg/client/listers/batch/v1alpha1"
 	vkcorelister "volcano.sh/volcano/pkg/client/listers/bus/v1alpha1"
-	"volcano.sh/volcano/pkg/controllers/job/apis"
-	jobcache "volcano.sh/volcano/pkg/controllers/job/cache"
+	"volcano.sh/volcano/pkg/controllers/apis"
+	jobcache "volcano.sh/volcano/pkg/controllers/cache"
 	"volcano.sh/volcano/pkg/controllers/job/state"
 )
 
diff --git a/pkg/controllers/job/job_controller_actions.go b/pkg/controllers/job/job_controller_actions.go
@@ -32,7 +32,7 @@ import (
 	vkbatchv1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1"
 	vkv1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1"
 	"volcano.sh/volcano/pkg/apis/helpers"
-	"volcano.sh/volcano/pkg/controllers/job/apis"
+	"volcano.sh/volcano/pkg/controllers/apis"
 	vkjobhelpers "volcano.sh/volcano/pkg/controllers/job/helpers"
 	"volcano.sh/volcano/pkg/controllers/job/state"
 )
diff --git a/pkg/controllers/job/job_controller_const.go b/pkg/controllers/job/job_controller_const.go
diff --git a/pkg/controllers/job/job_controller_handler.go b/pkg/controllers/job/job_controller_handler.go
@@ -29,8 +29,8 @@ import (
 	kbtype "github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1"
 	vkbatchv1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1"
 	vkbusv1 "volcano.sh/volcano/pkg/apis/bus/v1alpha1"
-	"volcano.sh/volcano/pkg/controllers/job/apis"
-	vkcache "volcano.sh/volcano/pkg/controllers/job/cache"
+	"volcano.sh/volcano/pkg/controllers/apis"
+	vkcache "volcano.sh/volcano/pkg/controllers/cache"
 )
 
 func (cc *Controller) addCommand(obj interface{}) {
diff --git a/pkg/controllers/job/job_controller_util.go b/pkg/controllers/job/job_controller_util.go
@@ -29,7 +29,7 @@ import (
 	admissioncontroller "volcano.sh/volcano/pkg/admission"
 	vkv1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1"
 	"volcano.sh/volcano/pkg/apis/helpers"
-	"volcano.sh/volcano/pkg/controllers/job/apis"
+	"volcano.sh/volcano/pkg/controllers/apis"
 )
 
 func eventKey(obj interface{}) interface{} {
diff --git a/pkg/controllers/job/state/aborted.go b/pkg/controllers/job/state/aborted.go
@@ -18,7 +18,7 @@ package state
 
 import (
 	vkv1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1"
-	"volcano.sh/volcano/pkg/controllers/job/apis"
+	"volcano.sh/volcano/pkg/controllers/apis"
 )
 
 type abortedState struct {
diff --git a/pkg/controllers/job/state/aborting.go b/pkg/controllers/job/state/aborting.go
@@ -18,7 +18,7 @@ package state
 
 import (
 	vkv1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1"
-	"volcano.sh/volcano/pkg/controllers/job/apis"
+	"volcano.sh/volcano/pkg/controllers/apis"
 )
 
 type abortingState struct {
diff --git a/pkg/controllers/job/state/completing.go b/pkg/controllers/job/state/completing.go
@@ -18,7 +18,7 @@ package state
 
 import (
 	vkv1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1"
-	"volcano.sh/volcano/pkg/controllers/job/apis"
+	"volcano.sh/volcano/pkg/controllers/apis"
 )
 
 type completingState struct {
diff --git a/pkg/controllers/job/state/factory.go b/pkg/controllers/job/state/factory.go
@@ -18,7 +18,7 @@ package state
 
 import (
 	vkv1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1"
-	"volcano.sh/volcano/pkg/controllers/job/apis"
+	"volcano.sh/volcano/pkg/controllers/apis"
 )
 
 type NextStateFn func(status vkv1.JobStatus) vkv1.JobState
diff --git a/pkg/controllers/job/state/finished.go b/pkg/controllers/job/state/finished.go
@@ -18,7 +18,7 @@ package state
 
 import (
 	vkv1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1"
-	"volcano.sh/volcano/pkg/controllers/job/apis"
+	"volcano.sh/volcano/pkg/controllers/apis"
 )
 
 type finishedState struct {
diff --git a/pkg/controllers/job/state/pending.go b/pkg/controllers/job/state/pending.go
@@ -18,7 +18,7 @@ package state
 
 import (
 	vkv1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1"
-	"volcano.sh/volcano/pkg/controllers/job/apis"
+	"volcano.sh/volcano/pkg/controllers/apis"
 )
 
 type pendingState struct {
diff --git a/pkg/controllers/job/state/restarting.go b/pkg/controllers/job/state/restarting.go
@@ -18,7 +18,7 @@ package state
 
 import (
 	vkv1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1"
-	"volcano.sh/volcano/pkg/controllers/job/apis"
+	"volcano.sh/volcano/pkg/controllers/apis"
 )
 
 type restartingState struct {
diff --git a/pkg/controllers/job/state/running.go b/pkg/controllers/job/state/running.go
@@ -18,7 +18,7 @@ package state
 
 import (
 	vkv1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1"
-	"volcano.sh/volcano/pkg/controllers/job/apis"
+	"volcano.sh/volcano/pkg/controllers/apis"
 )
 
 type runningState struct {
diff --git a/pkg/controllers/job/state/terminating.go b/pkg/controllers/job/state/terminating.go
@@ -18,7 +18,7 @@ package state
 
 import (
 	vkv1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1"
-	"volcano.sh/volcano/pkg/controllers/job/apis"
+	"volcano.sh/volcano/pkg/controllers/apis"
 )
 
 type terminatingState struct {

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ import (`
`26`	`26`	`"k8s.io/client-go/util/workqueue"`
`27`	`27`
`28`	`28`	`"volcano.sh/volcano/pkg/apis/batch/v1alpha1"`
`29`		`- "volcano.sh/volcano/pkg/controllers/job/apis"`
	`29`	`+ "volcano.sh/volcano/pkg/controllers/apis"`
`30`	`30`	`)`
`31`	`31`
`32`	`32`	`type jobCache struct {`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import (`
`20`	`20`	`"k8s.io/api/core/v1"`
`21`	`21`
`22`	`22`	`"volcano.sh/volcano/pkg/apis/batch/v1alpha1"`
`23`		`- "volcano.sh/volcano/pkg/controllers/job/apis"`
	`23`	`+ "volcano.sh/volcano/pkg/controllers/apis"`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`type Cache interface {`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ import (`
`32`	`32`	`vkbatchv1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1"`
`33`	`33`	`vkv1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1"`
`34`	`34`	`"volcano.sh/volcano/pkg/apis/helpers"`
`35`		`- "volcano.sh/volcano/pkg/controllers/job/apis"`
	`35`	`+ "volcano.sh/volcano/pkg/controllers/apis"`
`36`	`36`	`vkjobhelpers "volcano.sh/volcano/pkg/controllers/job/helpers"`
`37`	`37`	`"volcano.sh/volcano/pkg/controllers/job/state"`
`38`	`38`	`)`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ import (`
`29`	`29`	`admissioncontroller "volcano.sh/volcano/pkg/admission"`
`30`	`30`	`vkv1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1"`
`31`	`31`	`"volcano.sh/volcano/pkg/apis/helpers"`
`32`		`- "volcano.sh/volcano/pkg/controllers/job/apis"`
	`32`	`+ "volcano.sh/volcano/pkg/controllers/apis"`
`33`	`33`	`)`
`34`	`34`
`35`	`35`	`func eventKey(obj interface{}) interface{} {`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ package state`
`18`	`18`
`19`	`19`	`import (`
`20`	`20`	`vkv1 "volcano.sh/volcano/pkg/apis/batch/v1alpha1"`
`21`		`- "volcano.sh/volcano/pkg/controllers/job/apis"`
	`21`	`+ "volcano.sh/volcano/pkg/controllers/apis"`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`type abortedState struct {`