diff --git a/operators/focom-operator/PROJECT b/operators/focom-operator/PROJECT index bacf1f18..3fc03ed1 100644 --- a/operators/focom-operator/PROJECT +++ b/operators/focom-operator/PROJECT @@ -10,7 +10,7 @@ plugins: manifests.sdk.operatorframework.io/v2: {} scorecard.sdk.operatorframework.io/v2: {} projectName: focom-operator -repo: github.com/dekstroza/focom-operator +repo: github.com/nephio-project/nephio/operators/focom-operator resources: - api: crdVersion: v1 @@ -18,7 +18,7 @@ resources: domain: nephio.org group: focom kind: OCloud - path: github.com/dekstroza/focom-operator/api/v1alpha1 + path: github.com/nephio-project/nephio/operators/focom-operator/api/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -27,7 +27,7 @@ resources: domain: nephio.org group: focom kind: FocomProvisioningRequest - path: github.com/dekstroza/focom-operator/api/v1alpha1 + path: github.com/nephio-project/nephio/operators/focom-operator/api/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -35,6 +35,6 @@ resources: domain: nephio.org group: provisioning kind: TemplateInfo - path: github.com/dekstroza/focom-operator/api/provisioning/v1alpha1 + path: github.com/nephio-project/nephio/operators/focom-operator/api/provisioning/v1alpha1 version: v1alpha1 version: "3" diff --git a/operators/focom-operator/cmd/main.go b/operators/focom-operator/cmd/main.go index e7513f35..36cc4265 100644 --- a/operators/focom-operator/cmd/main.go +++ b/operators/focom-operator/cmd/main.go @@ -19,7 +19,7 @@ package main import ( "crypto/tls" "flag" - focomv1alpha1 "github.com/dekstroza/focom-operator/api/focom/v1alpha1" + focomv1alpha1 "github.com/nephio-project/nephio/operators/focom-operator/api/focom/v1alpha1" "os" // Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.) @@ -36,8 +36,8 @@ import ( metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server" "sigs.k8s.io/controller-runtime/pkg/webhook" - provisioningv1alpha1 "github.com/dekstroza/focom-operator/api/provisioning/v1alpha1" - "github.com/dekstroza/focom-operator/internal/controller" + provisioningv1alpha1 "github.com/nephio-project/nephio/operators/focom-operator/api/provisioning/v1alpha1" + "github.com/nephio-project/nephio/operators/focom-operator/internal/controller" // +kubebuilder:scaffold:imports ) diff --git a/operators/focom-operator/internal/controller/focomprovisioningrequest_controller.go b/operators/focom-operator/internal/controller/focomprovisioningrequest_controller.go index c0f98d1b..62ffff32 100644 --- a/operators/focom-operator/internal/controller/focomprovisioningrequest_controller.go +++ b/operators/focom-operator/internal/controller/focomprovisioningrequest_controller.go @@ -19,12 +19,13 @@ package controller import ( "context" "fmt" - focomv1alpha1 "github.com/dekstroza/focom-operator/api/focom/v1alpha1" + "time" + "github.com/go-logr/logr" + focomv1alpha1 "github.com/nephio-project/nephio/operators/focom-operator/api/focom/v1alpha1" k8serrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - "time" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/operators/focom-operator/internal/controller/focomprovisioningrequest_helpers.go b/operators/focom-operator/internal/controller/focomprovisioningrequest_helpers.go index 2f6a23a8..d3247826 100644 --- a/operators/focom-operator/internal/controller/focomprovisioningrequest_helpers.go +++ b/operators/focom-operator/internal/controller/focomprovisioningrequest_helpers.go @@ -5,7 +5,7 @@ import ( "encoding/json" "fmt" - focomv1alpha1 "github.com/dekstroza/focom-operator/api/focom/v1alpha1" + focomv1alpha1 "github.com/nephio-project/nephio/operators/focom-operator/api/focom/v1alpha1" k8serrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/operators/focom-operator/internal/controller/focomprovisioningrequest_helpers_test.go b/operators/focom-operator/internal/controller/focomprovisioningrequest_helpers_test.go index d4f0dbab..691ac920 100644 --- a/operators/focom-operator/internal/controller/focomprovisioningrequest_helpers_test.go +++ b/operators/focom-operator/internal/controller/focomprovisioningrequest_helpers_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - focomv1alpha1 "github.com/dekstroza/focom-operator/api/focom/v1alpha1" + focomv1alpha1 "github.com/nephio-project/nephio/operators/focom-operator/api/focom/v1alpha1" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" diff --git a/operators/focom-operator/internal/controller/focomprovisioningrequest_kubeconfig.go b/operators/focom-operator/internal/controller/focomprovisioningrequest_kubeconfig.go index 7a5aefa7..b1830edc 100644 --- a/operators/focom-operator/internal/controller/focomprovisioningrequest_kubeconfig.go +++ b/operators/focom-operator/internal/controller/focomprovisioningrequest_kubeconfig.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - focomv1alpha1 "github.com/dekstroza/focom-operator/api/focom/v1alpha1" + focomv1alpha1 "github.com/nephio-project/nephio/operators/focom-operator/api/focom/v1alpha1" corev1 "k8s.io/api/core/v1" k8serrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" diff --git a/operators/focom-operator/internal/controller/focomprovisioningrequest_validation.go b/operators/focom-operator/internal/controller/focomprovisioningrequest_validation.go index 3e0f1163..7420704c 100644 --- a/operators/focom-operator/internal/controller/focomprovisioningrequest_validation.go +++ b/operators/focom-operator/internal/controller/focomprovisioningrequest_validation.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - focomv1alpha1 "github.com/dekstroza/focom-operator/api/focom/v1alpha1" - provisioningv1alpha1 "github.com/dekstroza/focom-operator/api/provisioning/v1alpha1" + focomv1alpha1 "github.com/nephio-project/nephio/operators/focom-operator/api/focom/v1alpha1" + provisioningv1alpha1 "github.com/nephio-project/nephio/operators/focom-operator/api/provisioning/v1alpha1" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" ) diff --git a/operators/focom-operator/internal/controller/focomprovisioningrequest_validation_test.go b/operators/focom-operator/internal/controller/focomprovisioningrequest_validation_test.go index 048436f2..117c3a6b 100644 --- a/operators/focom-operator/internal/controller/focomprovisioningrequest_validation_test.go +++ b/operators/focom-operator/internal/controller/focomprovisioningrequest_validation_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - focomv1alpha1 "github.com/dekstroza/focom-operator/api/focom/v1alpha1" - provisioningv1alpha1 "github.com/dekstroza/focom-operator/api/provisioning/v1alpha1" + focomv1alpha1 "github.com/nephio-project/nephio/operators/focom-operator/api/focom/v1alpha1" + provisioningv1alpha1 "github.com/nephio-project/nephio/operators/focom-operator/api/provisioning/v1alpha1" "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/operators/focom-operator/internal/controller/suite_test.go b/operators/focom-operator/internal/controller/suite_test.go index 7275afdb..a8930c8e 100644 --- a/operators/focom-operator/internal/controller/suite_test.go +++ b/operators/focom-operator/internal/controller/suite_test.go @@ -19,11 +19,12 @@ package controller import ( "context" "fmt" - focomv1alpha1 "github.com/dekstroza/focom-operator/api/focom/v1alpha1" "path/filepath" "runtime" "testing" + focomv1alpha1 "github.com/nephio-project/nephio/operators/focom-operator/api/focom/v1alpha1" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/operators/focom-operator/test/e2e/e2e_test.go b/operators/focom-operator/test/e2e/e2e_test.go index 136b819f..3f7017c4 100644 --- a/operators/focom-operator/test/e2e/e2e_test.go +++ b/operators/focom-operator/test/e2e/e2e_test.go @@ -24,7 +24,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/dekstroza/focom-operator/test/utils" + "github.com/nephio-project/nephio/operators/focom-operator/test/utils" ) const namespace = "focom-operator-system"