Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions control-operator/PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -27,14 +27,14 @@ 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
namespaced: true
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"
4 changes: 2 additions & 2 deletions control-operator/cmd/environment-manager/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions control-operator/cmd/task-manager/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions control-operator/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/AliceO2Group/Control/operator
module github.com/AliceO2Group/Control/control-operator

go 1.25.0

Expand Down Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions control-operator/internal/controller/grpc_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion control-operator/internal/controller/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
2 changes: 1 addition & 1 deletion control-operator/internal/controller/task_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
Loading