Skip to content

Commit 9833c86

Browse files
authored
create a minimal external API for codeflare-operator (#58)
Move the AppWrapperConfig and controller setup entrypoint from internal to pkg to enable them to be imported by the codeflare-operator.
1 parent eef3f4c commit 9833c86

File tree

9 files changed

+11
-10
lines changed

9 files changed

+11
-10
lines changed

Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ COPY go.sum go.sum
1212
RUN go mod download
1313

1414
# Copy the go source
15-
COPY cmd/ cmd/
1615
COPY api/ api/
16+
COPY cmd/ cmd/
1717
COPY internal/ internal/
18+
COPY pkg/ pkg/
1819

1920
# Build
2021
# the GOARCH has not a default value to allow the binary be built according to the host where the command

cmd/standalone/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ import (
3535
"sigs.k8s.io/controller-runtime/pkg/webhook"
3636

3737
workloadv1beta2 "github.com/project-codeflare/appwrapper/api/v1beta2"
38-
"github.com/project-codeflare/appwrapper/internal/config"
39-
"github.com/project-codeflare/appwrapper/internal/controller"
38+
"github.com/project-codeflare/appwrapper/pkg/config"
39+
"github.com/project-codeflare/appwrapper/pkg/controller"
4040
//+kubebuilder:scaffold:imports
4141
)
4242

cmd/unified/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ import (
3636
kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
3737

3838
workloadv1beta2 "github.com/project-codeflare/appwrapper/api/v1beta2"
39-
"github.com/project-codeflare/appwrapper/internal/config"
40-
"github.com/project-codeflare/appwrapper/internal/controller"
39+
"github.com/project-codeflare/appwrapper/pkg/config"
40+
"github.com/project-codeflare/appwrapper/pkg/controller"
4141
//+kubebuilder:scaffold:imports
4242
)
4343

internal/controller/appwrapper/appwrapper_controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ import (
4141
utilmaps "sigs.k8s.io/kueue/pkg/util/maps"
4242

4343
workloadv1beta2 "github.com/project-codeflare/appwrapper/api/v1beta2"
44-
"github.com/project-codeflare/appwrapper/internal/config"
4544
"github.com/project-codeflare/appwrapper/internal/utils"
45+
"github.com/project-codeflare/appwrapper/pkg/config"
4646
)
4747

4848
const (

internal/controller/appwrapper/appwrapper_controller_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ import (
2929
utilslices "sigs.k8s.io/kueue/pkg/util/slices"
3030

3131
workloadv1beta2 "github.com/project-codeflare/appwrapper/api/v1beta2"
32-
"github.com/project-codeflare/appwrapper/internal/config"
3332
"github.com/project-codeflare/appwrapper/internal/controller/workload"
3433
"github.com/project-codeflare/appwrapper/internal/utils"
34+
"github.com/project-codeflare/appwrapper/pkg/config"
3535
)
3636

3737
var _ = Describe("AppWrapper Controller", func() {

internal/webhook/appwrapper_webhook.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ import (
3939
"sigs.k8s.io/kueue/pkg/controller/jobframework"
4040

4141
workloadv1beta2 "github.com/project-codeflare/appwrapper/api/v1beta2"
42-
"github.com/project-codeflare/appwrapper/internal/config"
4342
wlc "github.com/project-codeflare/appwrapper/internal/controller/workload"
4443
"github.com/project-codeflare/appwrapper/internal/utils"
44+
"github.com/project-codeflare/appwrapper/pkg/config"
4545
)
4646

4747
type AppWrapperWebhook struct {

internal/webhook/suite_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ import (
4646
"sigs.k8s.io/controller-runtime/pkg/webhook"
4747

4848
workloadv1beta2 "github.com/project-codeflare/appwrapper/api/v1beta2"
49-
"github.com/project-codeflare/appwrapper/internal/config"
49+
"github.com/project-codeflare/appwrapper/pkg/config"
5050
kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1"
5151
)
5252

File renamed without changes.

internal/controller/setup.go renamed to pkg/controller/setup.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ import (
2323

2424
ctrl "sigs.k8s.io/controller-runtime"
2525

26-
"github.com/project-codeflare/appwrapper/internal/config"
2726
"github.com/project-codeflare/appwrapper/internal/controller/appwrapper"
2827
"github.com/project-codeflare/appwrapper/internal/controller/workload"
2928
"github.com/project-codeflare/appwrapper/internal/webhook"
29+
"github.com/project-codeflare/appwrapper/pkg/config"
3030

3131
"sigs.k8s.io/kueue/pkg/controller/jobframework"
3232
)

0 commit comments

Comments
 (0)