Skip to content

Commit

Permalink
Merge pull request #631 from mimowo/restructure-job-framework-dirs
Browse files Browse the repository at this point in the history 
Reorganize directory structure for jobs and the framework
  • Loading branch information
@k8s-ci-robot
k8s-ci-robot authored Mar 14, 2023
2 parents 6b597c2 + 6c668af commit d5075a3
Show file tree
Hide file tree
Showing 21 changed files with 19 additions and 19 deletions.
6 changes: 3 additions & 3 deletions main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ import (
"sigs.k8s.io/kueue/pkg/constants"
"sigs.k8s.io/kueue/pkg/controller/core"
"sigs.k8s.io/kueue/pkg/controller/core/indexer"
"sigs.k8s.io/kueue/pkg/controller/workload/job"
"sigs.k8s.io/kueue/pkg/controller/workload/jobframework"
"sigs.k8s.io/kueue/pkg/controller/workload/mpijob"
"sigs.k8s.io/kueue/pkg/controller/jobframework"
"sigs.k8s.io/kueue/pkg/controller/jobs/job"
"sigs.k8s.io/kueue/pkg/controller/jobs/mpijob"
"sigs.k8s.io/kueue/pkg/metrics"
"sigs.k8s.io/kueue/pkg/queue"
"sigs.k8s.io/kueue/pkg/scheduler"
Expand Down
0 ...roller/workload/jobframework/interface.go → pkg/controller/jobframework/interface.go
View file
File renamed without changes.
0 ...workload/jobframework/known_frameworks.go → ...ntroller/jobframework/known_frameworks.go
View file
File renamed without changes.
0 ...oller/workload/jobframework/reconciler.go → pkg/controller/jobframework/reconciler.go
View file
File renamed without changes.
0 ...r/workload/jobframework/workload_names.go → ...controller/jobframework/workload_names.go
View file
File renamed without changes.
0 ...kload/jobframework/workload_names_test.go → ...oller/jobframework/workload_names_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...controller/workload/job/job_controller.go → pkg/controller/jobs/job/job_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import (

kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
"sigs.k8s.io/kueue/pkg/constants"
"sigs.k8s.io/kueue/pkg/controller/workload/jobframework"
"sigs.k8s.io/kueue/pkg/controller/jobframework"
)

var (
Expand Down
0 ...oller/workload/job/job_controller_test.go → ...ontroller/jobs/job/job_controller_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/controller/workload/job/job_webhook.go → pkg/controller/jobs/job/job_webhook.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/webhook"

"sigs.k8s.io/kueue/pkg/constants"
"sigs.k8s.io/kueue/pkg/controller/workload/jobframework"
"sigs.k8s.io/kueue/pkg/controller/jobframework"
"sigs.k8s.io/kueue/pkg/util/pointer"
)

Expand Down
0 ...ntroller/workload/job/job_webhook_test.go → pkg/controller/jobs/job/job_webhook_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ller/workload/mpijob/mpijob_controller.go → ...ntroller/jobs/mpijob/mpijob_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (

kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
"sigs.k8s.io/kueue/pkg/constants"
"sigs.k8s.io/kueue/pkg/controller/workload/jobframework"
"sigs.k8s.io/kueue/pkg/controller/jobframework"
)

var (
Expand Down
0 ...workload/mpijob/mpijob_controller_test.go → ...ler/jobs/mpijob/mpijob_controller_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...troller/workload/mpijob/mpijob_webhook.go → pkg/controller/jobs/mpijob/mpijob_webhook.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/webhook"

"sigs.k8s.io/kueue/pkg/constants"
"sigs.k8s.io/kueue/pkg/controller/workload/jobframework"
"sigs.k8s.io/kueue/pkg/controller/jobframework"
"sigs.k8s.io/kueue/pkg/util/pointer"
)

Expand Down
2 changes: 1 addition & 1 deletion test/e2e/e2e_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"k8s.io/apimachinery/pkg/types"

kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
workloadjob "sigs.k8s.io/kueue/pkg/controller/workload/job"
workloadjob "sigs.k8s.io/kueue/pkg/controller/jobs/job"
"sigs.k8s.io/kueue/pkg/util/testing"
"sigs.k8s.io/kueue/test/util"
)
Expand Down
4 changes: 2 additions & 2 deletions test/integration/controller/job/job_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ import (

kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
"sigs.k8s.io/kueue/pkg/constants"
workloadjob "sigs.k8s.io/kueue/pkg/controller/workload/job"
"sigs.k8s.io/kueue/pkg/controller/workload/jobframework"
"sigs.k8s.io/kueue/pkg/controller/jobframework"
workloadjob "sigs.k8s.io/kueue/pkg/controller/jobs/job"
"sigs.k8s.io/kueue/pkg/util/pointer"
"sigs.k8s.io/kueue/pkg/util/testing"
"sigs.k8s.io/kueue/pkg/workload"
Expand Down
2 changes: 1 addition & 1 deletion test/integration/controller/job/job_webhook_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"k8s.io/apimachinery/pkg/types"

"sigs.k8s.io/kueue/pkg/constants"
"sigs.k8s.io/kueue/pkg/controller/workload/jobframework"
"sigs.k8s.io/kueue/pkg/controller/jobframework"
"sigs.k8s.io/kueue/pkg/util/pointer"
"sigs.k8s.io/kueue/pkg/util/testing"
"sigs.k8s.io/kueue/test/integration/framework"
Expand Down
4 changes: 2 additions & 2 deletions test/integration/controller/job/suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ import (
"sigs.k8s.io/kueue/pkg/constants"
"sigs.k8s.io/kueue/pkg/controller/core"
"sigs.k8s.io/kueue/pkg/controller/core/indexer"
"sigs.k8s.io/kueue/pkg/controller/workload/job"
"sigs.k8s.io/kueue/pkg/controller/workload/jobframework"
"sigs.k8s.io/kueue/pkg/controller/jobframework"
"sigs.k8s.io/kueue/pkg/controller/jobs/job"
"sigs.k8s.io/kueue/pkg/queue"
"sigs.k8s.io/kueue/pkg/scheduler"
"sigs.k8s.io/kueue/test/integration/framework"
Expand Down
4 changes: 2 additions & 2 deletions test/integration/controller/mpijob/mpijob_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ import (

kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
"sigs.k8s.io/kueue/pkg/constants"
"sigs.k8s.io/kueue/pkg/controller/workload/jobframework"
workloadmpijob "sigs.k8s.io/kueue/pkg/controller/workload/mpijob"
"sigs.k8s.io/kueue/pkg/controller/jobframework"
workloadmpijob "sigs.k8s.io/kueue/pkg/controller/jobs/mpijob"
"sigs.k8s.io/kueue/pkg/util/testing"
"sigs.k8s.io/kueue/test/integration/framework"
"sigs.k8s.io/kueue/test/util"
Expand Down
4 changes: 2 additions & 2 deletions test/integration/controller/mpijob/suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ import (
"sigs.k8s.io/kueue/pkg/constants"
"sigs.k8s.io/kueue/pkg/controller/core"
"sigs.k8s.io/kueue/pkg/controller/core/indexer"
"sigs.k8s.io/kueue/pkg/controller/workload/jobframework"
"sigs.k8s.io/kueue/pkg/controller/workload/mpijob"
"sigs.k8s.io/kueue/pkg/controller/jobframework"
"sigs.k8s.io/kueue/pkg/controller/jobs/mpijob"
"sigs.k8s.io/kueue/pkg/queue"
"sigs.k8s.io/kueue/pkg/scheduler"
"sigs.k8s.io/kueue/test/integration/framework"
Expand Down
2 changes: 1 addition & 1 deletion test/integration/scheduler/podsready/suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (
"sigs.k8s.io/kueue/pkg/constants"
"sigs.k8s.io/kueue/pkg/controller/core"
"sigs.k8s.io/kueue/pkg/controller/core/indexer"
workloadjob "sigs.k8s.io/kueue/pkg/controller/workload/job"
workloadjob "sigs.k8s.io/kueue/pkg/controller/jobs/job"
"sigs.k8s.io/kueue/pkg/queue"
"sigs.k8s.io/kueue/pkg/scheduler"
"sigs.k8s.io/kueue/test/integration/framework"
Expand Down
2 changes: 1 addition & 1 deletion test/integration/scheduler/suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"sigs.k8s.io/kueue/pkg/constants"
"sigs.k8s.io/kueue/pkg/controller/core"
"sigs.k8s.io/kueue/pkg/controller/core/indexer"
workloadjob "sigs.k8s.io/kueue/pkg/controller/workload/job"
workloadjob "sigs.k8s.io/kueue/pkg/controller/jobs/job"
"sigs.k8s.io/kueue/pkg/queue"
"sigs.k8s.io/kueue/pkg/scheduler"
"sigs.k8s.io/kueue/test/integration/framework"
Expand Down

0 comments on commit d5075a3

Please sign in to comment.