diff --git a/control-operator/PROJECT b/control-operator/PROJECT index d89e1dce..0f052ac3 100644 --- a/control-operator/PROJECT +++ b/control-operator/PROJECT @@ -9,7 +9,7 @@ plugins: manifests.sdk.operatorframework.io/v2: {} scorecard.sdk.operatorframework.io/v2: {} projectName: operator -repo: github.com/AliceO2Group/Control/operator +repo: github.com/AliceO2Group/Control/control-operator resources: - api: crdVersion: v1 @@ -18,7 +18,7 @@ resources: domain: alice.cern group: aliecs kind: Task - path: github.com/AliceO2Group/Control/operator/api/v1alpha1 + path: github.com/AliceO2Group/Control/control-operator/api/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -27,7 +27,7 @@ resources: domain: alice.cern group: aliecs kind: Environment - path: github.com/AliceO2Group/Control/operator/api/v1alpha1 + path: github.com/AliceO2Group/Control/control-operator/api/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -35,6 +35,6 @@ resources: domain: alice.cern group: aliecs kind: TaskTemplate - path: github.com/AliceO2Group/Control/operator/api/v1alpha1 + path: github.com/AliceO2Group/Control/control-operator/api/v1alpha1 version: v1alpha1 version: "3" diff --git a/control-operator/cmd/environment-manager/main.go b/control-operator/cmd/environment-manager/main.go index 9033f861..bdc4cc34 100644 --- a/control-operator/cmd/environment-manager/main.go +++ b/control-operator/cmd/environment-manager/main.go @@ -38,8 +38,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/metrics/server" "sigs.k8s.io/controller-runtime/pkg/webhook" - aliecsv1alpha1 "github.com/AliceO2Group/Control/operator/api/v1alpha1" - "github.com/AliceO2Group/Control/operator/internal/controller" + aliecsv1alpha1 "github.com/AliceO2Group/Control/control-operator/api/v1alpha1" + "github.com/AliceO2Group/Control/control-operator/internal/controller" ) var ( diff --git a/control-operator/cmd/task-manager/main.go b/control-operator/cmd/task-manager/main.go index b1d171b5..046a0b6f 100644 --- a/control-operator/cmd/task-manager/main.go +++ b/control-operator/cmd/task-manager/main.go @@ -39,8 +39,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/metrics/server" "sigs.k8s.io/controller-runtime/pkg/webhook" - aliecsv1alpha1 "github.com/AliceO2Group/Control/operator/api/v1alpha1" - "github.com/AliceO2Group/Control/operator/internal/controller" + aliecsv1alpha1 "github.com/AliceO2Group/Control/control-operator/api/v1alpha1" + "github.com/AliceO2Group/Control/control-operator/internal/controller" ) var ( diff --git a/control-operator/go.mod b/control-operator/go.mod index b95e4ec5..1a50ceea 100644 --- a/control-operator/go.mod +++ b/control-operator/go.mod @@ -1,4 +1,4 @@ -module github.com/AliceO2Group/Control/operator +module github.com/AliceO2Group/Control/control-operator go 1.25.0 @@ -82,4 +82,4 @@ require ( sigs.k8s.io/yaml v1.6.0 // indirect ) -replace github.com/AliceO2Group/Control/operator/internal/controller/protos/generated => ./internal/controller/protos/generated +replace github.com/AliceO2Group/Control/control-operator/internal/controller/protos/generated => ./internal/controller/protos/generated diff --git a/control-operator/internal/controller/environment_controller.go b/control-operator/internal/controller/environment_controller.go index 8455d997..c66ec38f 100644 --- a/control-operator/internal/controller/environment_controller.go +++ b/control-operator/internal/controller/environment_controller.go @@ -42,7 +42,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" - aliecsv1alpha1 "github.com/AliceO2Group/Control/operator/api/v1alpha1" + aliecsv1alpha1 "github.com/AliceO2Group/Control/control-operator/api/v1alpha1" "github.com/go-logr/logr" ) diff --git a/control-operator/internal/controller/environment_controller_test.go b/control-operator/internal/controller/environment_controller_test.go index dfadf48c..8a7532f7 100644 --- a/control-operator/internal/controller/environment_controller_test.go +++ b/control-operator/internal/controller/environment_controller_test.go @@ -35,7 +35,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - aliecsv1alpha1 "github.com/AliceO2Group/Control/operator/api/v1alpha1" + aliecsv1alpha1 "github.com/AliceO2Group/Control/control-operator/api/v1alpha1" ) var _ = Describe("Environment Controller", func() { diff --git a/control-operator/internal/controller/fairmq_transition.go b/control-operator/internal/controller/fairmq_transition.go index ac58a50b..1fe9cabf 100644 --- a/control-operator/internal/controller/fairmq_transition.go +++ b/control-operator/internal/controller/fairmq_transition.go @@ -29,7 +29,7 @@ import ( "fmt" "strings" - pb "github.com/AliceO2Group/Control/operator/internal/controller/protos/generated" + pb "github.com/AliceO2Group/Control/control-operator/internal/controller/protos/generated" ) // FairMQ internal state names as used by the OCC plugin diff --git a/control-operator/internal/controller/grpc_client.go b/control-operator/internal/controller/grpc_client.go index a76310cb..3b82f4e4 100644 --- a/control-operator/internal/controller/grpc_client.go +++ b/control-operator/internal/controller/grpc_client.go @@ -39,8 +39,8 @@ import ( "google.golang.org/grpc/status" "k8s.io/apimachinery/pkg/types" - aliecsv1alpha1 "github.com/AliceO2Group/Control/operator/api/v1alpha1" - pb "github.com/AliceO2Group/Control/operator/internal/controller/protos/generated" + aliecsv1alpha1 "github.com/AliceO2Group/Control/control-operator/api/v1alpha1" + pb "github.com/AliceO2Group/Control/control-operator/internal/controller/protos/generated" ) // jsonOccClient mirrors executor/executorcmd/nopb/occclient.go: uses short method diff --git a/control-operator/internal/controller/suite_test.go b/control-operator/internal/controller/suite_test.go index 7e57b8ab..f9d2f5c4 100644 --- a/control-operator/internal/controller/suite_test.go +++ b/control-operator/internal/controller/suite_test.go @@ -38,7 +38,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - aliecsv1alpha1 "github.com/AliceO2Group/Control/operator/api/v1alpha1" + aliecsv1alpha1 "github.com/AliceO2Group/Control/control-operator/api/v1alpha1" //+kubebuilder:scaffold:imports ) diff --git a/control-operator/internal/controller/task_controller.go b/control-operator/internal/controller/task_controller.go index cbace704..ff3fc21f 100644 --- a/control-operator/internal/controller/task_controller.go +++ b/control-operator/internal/controller/task_controller.go @@ -46,7 +46,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/predicate" - aliecsv1alpha1 "github.com/AliceO2Group/Control/operator/api/v1alpha1" + aliecsv1alpha1 "github.com/AliceO2Group/Control/control-operator/api/v1alpha1" "github.com/go-logr/logr" )