From 86846b603eccb362c4dbb0d261cdec7d509ebfe6 Mon Sep 17 00:00:00 2001 From: Asaad Balum Date: Sun, 2 Nov 2025 12:34:37 +0200 Subject: [PATCH 1/3] chore: Update Go module paths from kubeflow/kubeflow to kubeflow/notebooks - Updated module declarations in 3 go.mod files (notebook-controller, tensorboard-controller, pvcviewer-controller) - Updated all internal import statements in Go source files to match new module paths - Updated reconcilehelper imports to use local paths (after PR #702 moved reconcilehelper into each controller) - Verified all components compile successfully Fixes #699 Signed-off-by: Asaad Balum --- .../api/v1/notebook_conversion.go | 2 +- .../api/v1alpha1/notebook_conversion.go | 2 +- .../controllers/culling_controller.go | 4 ++-- .../controllers/notebook_controller.go | 6 +++--- .../controllers/notebook_controller_bdd_test.go | 2 +- .../controllers/notebook_controller_test.go | 2 +- .../notebook-controller/controllers/suite_test.go | 4 ++-- components/notebook-controller/go.mod | 2 +- components/notebook-controller/main.go | 10 +++++----- .../controllers/pvcviewer_controller.go | 2 +- .../controllers/pvcviewer_controller_test.go | 2 +- .../pvcviewer-controller/controllers/suite_test.go | 2 +- .../pvcviewer-controller/controllers/test_utils.go | 2 +- components/pvcviewer-controller/go.mod | 2 +- components/pvcviewer-controller/main.go | 4 ++-- .../controllers/suite_test.go | 2 +- .../controllers/tensorboard_controller.go | 14 +++++++------- components/tensorboard-controller/go.mod | 2 +- components/tensorboard-controller/main.go | 5 +++-- 19 files changed, 36 insertions(+), 35 deletions(-) diff --git a/components/notebook-controller/api/v1/notebook_conversion.go b/components/notebook-controller/api/v1/notebook_conversion.go index 1e88a460..f134b034 100644 --- a/components/notebook-controller/api/v1/notebook_conversion.go +++ b/components/notebook-controller/api/v1/notebook_conversion.go @@ -18,7 +18,7 @@ package v1 import ( "sigs.k8s.io/controller-runtime/pkg/conversion" - nbv1beta1 "github.com/kubeflow/kubeflow/components/notebook-controller/api/v1beta1" + nbv1beta1 "github.com/kubeflow/notebooks/components/notebook-controller/api/v1beta1" ) // ConvertTo converts this Notebook to the Hub version (v1beta1). diff --git a/components/notebook-controller/api/v1alpha1/notebook_conversion.go b/components/notebook-controller/api/v1alpha1/notebook_conversion.go index d32cfb45..8a40c064 100644 --- a/components/notebook-controller/api/v1alpha1/notebook_conversion.go +++ b/components/notebook-controller/api/v1alpha1/notebook_conversion.go @@ -18,7 +18,7 @@ package v1alpha1 import ( "sigs.k8s.io/controller-runtime/pkg/conversion" - nbv1beta1 "github.com/kubeflow/kubeflow/components/notebook-controller/api/v1beta1" + nbv1beta1 "github.com/kubeflow/notebooks/components/notebook-controller/api/v1beta1" ) // ConvertTo converts this Notebook to the Hub version (v1beta1). diff --git a/components/notebook-controller/controllers/culling_controller.go b/components/notebook-controller/controllers/culling_controller.go index f76a1364..14a95d46 100644 --- a/components/notebook-controller/controllers/culling_controller.go +++ b/components/notebook-controller/controllers/culling_controller.go @@ -19,8 +19,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" logf "sigs.k8s.io/controller-runtime/pkg/log" - "github.com/kubeflow/kubeflow/components/notebook-controller/api/v1beta1" - "github.com/kubeflow/kubeflow/components/notebook-controller/pkg/metrics" + "github.com/kubeflow/notebooks/components/notebook-controller/api/v1beta1" + "github.com/kubeflow/notebooks/components/notebook-controller/pkg/metrics" ) // The constants with name 'DEFAULT_{ENV_Var}' are the default values to be diff --git a/components/notebook-controller/controllers/notebook_controller.go b/components/notebook-controller/controllers/notebook_controller.go index 944dac3b..f8e72f50 100644 --- a/components/notebook-controller/controllers/notebook_controller.go +++ b/components/notebook-controller/controllers/notebook_controller.go @@ -25,9 +25,9 @@ import ( "time" "github.com/go-logr/logr" - reconcilehelper "github.com/kubeflow/kubeflow/components/notebook-controller/reconcilehelper" - "github.com/kubeflow/kubeflow/components/notebook-controller/api/v1beta1" - "github.com/kubeflow/kubeflow/components/notebook-controller/pkg/metrics" + reconcilehelper "github.com/kubeflow/notebooks/components/notebook-controller/reconcilehelper" + "github.com/kubeflow/notebooks/components/notebook-controller/api/v1beta1" + "github.com/kubeflow/notebooks/components/notebook-controller/pkg/metrics" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" apierrs "k8s.io/apimachinery/pkg/api/errors" diff --git a/components/notebook-controller/controllers/notebook_controller_bdd_test.go b/components/notebook-controller/controllers/notebook_controller_bdd_test.go index 02d28211..ccb96128 100644 --- a/components/notebook-controller/controllers/notebook_controller_bdd_test.go +++ b/components/notebook-controller/controllers/notebook_controller_bdd_test.go @@ -26,7 +26,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - nbv1beta1 "github.com/kubeflow/kubeflow/components/notebook-controller/api/v1beta1" + nbv1beta1 "github.com/kubeflow/notebooks/components/notebook-controller/api/v1beta1" ) var _ = Describe("Notebook controller", func() { diff --git a/components/notebook-controller/controllers/notebook_controller_test.go b/components/notebook-controller/controllers/notebook_controller_test.go index da45ee80..965029ea 100644 --- a/components/notebook-controller/controllers/notebook_controller_test.go +++ b/components/notebook-controller/controllers/notebook_controller_test.go @@ -14,7 +14,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/scheme" - nbv1beta1 "github.com/kubeflow/kubeflow/components/notebook-controller/api/v1beta1" + nbv1beta1 "github.com/kubeflow/notebooks/components/notebook-controller/api/v1beta1" ctrl "sigs.k8s.io/controller-runtime" ) diff --git a/components/notebook-controller/controllers/suite_test.go b/components/notebook-controller/controllers/suite_test.go index 64369532..c610a46f 100644 --- a/components/notebook-controller/controllers/suite_test.go +++ b/components/notebook-controller/controllers/suite_test.go @@ -20,7 +20,7 @@ import ( "path/filepath" "testing" - controllermetrics "github.com/kubeflow/kubeflow/components/notebook-controller/pkg/metrics" + controllermetrics "github.com/kubeflow/notebooks/components/notebook-controller/pkg/metrics" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" @@ -33,7 +33,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - nbv1beta1 "github.com/kubeflow/kubeflow/components/notebook-controller/api/v1beta1" + nbv1beta1 "github.com/kubeflow/notebooks/components/notebook-controller/api/v1beta1" // +kubebuilder:scaffold:imports ) diff --git a/components/notebook-controller/go.mod b/components/notebook-controller/go.mod index bad61fc2..af96888d 100644 --- a/components/notebook-controller/go.mod +++ b/components/notebook-controller/go.mod @@ -1,4 +1,4 @@ -module github.com/kubeflow/kubeflow/components/notebook-controller +module github.com/kubeflow/notebooks/components/notebook-controller go 1.17 diff --git a/components/notebook-controller/main.go b/components/notebook-controller/main.go index 619ff858..034d4218 100644 --- a/components/notebook-controller/main.go +++ b/components/notebook-controller/main.go @@ -31,11 +31,11 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - nbv1 "github.com/kubeflow/kubeflow/components/notebook-controller/api/v1" - nbv1alpha1 "github.com/kubeflow/kubeflow/components/notebook-controller/api/v1alpha1" - nbv1beta1 "github.com/kubeflow/kubeflow/components/notebook-controller/api/v1beta1" - "github.com/kubeflow/kubeflow/components/notebook-controller/controllers" - controller_metrics "github.com/kubeflow/kubeflow/components/notebook-controller/pkg/metrics" + nbv1 "github.com/kubeflow/notebooks/components/notebook-controller/api/v1" + nbv1alpha1 "github.com/kubeflow/notebooks/components/notebook-controller/api/v1alpha1" + nbv1beta1 "github.com/kubeflow/notebooks/components/notebook-controller/api/v1beta1" + "github.com/kubeflow/notebooks/components/notebook-controller/controllers" + controller_metrics "github.com/kubeflow/notebooks/components/notebook-controller/pkg/metrics" //+kubebuilder:scaffold:imports ) diff --git a/components/pvcviewer-controller/controllers/pvcviewer_controller.go b/components/pvcviewer-controller/controllers/pvcviewer_controller.go index cc97b3e1..29c1b5fe 100644 --- a/components/pvcviewer-controller/controllers/pvcviewer_controller.go +++ b/components/pvcviewer-controller/controllers/pvcviewer_controller.go @@ -34,7 +34,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" - kubefloworgv1alpha1 "github.com/kubeflow/kubeflow/components/pvc-viewer/api/v1alpha1" + kubefloworgv1alpha1 "github.com/kubeflow/notebooks/components/pvc-viewer/api/v1alpha1" ) // PVCViewerReconciler reconciles a PVCViewer object diff --git a/components/pvcviewer-controller/controllers/pvcviewer_controller_test.go b/components/pvcviewer-controller/controllers/pvcviewer_controller_test.go index 76a2685e..c7a6cea0 100644 --- a/components/pvcviewer-controller/controllers/pvcviewer_controller_test.go +++ b/components/pvcviewer-controller/controllers/pvcviewer_controller_test.go @@ -7,7 +7,7 @@ import ( // "strconv" - kubefloworgv1alpha1 "github.com/kubeflow/kubeflow/components/pvc-viewer/api/v1alpha1" + kubefloworgv1alpha1 "github.com/kubeflow/notebooks/components/pvc-viewer/api/v1alpha1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" appsv1 "k8s.io/api/apps/v1" diff --git a/components/pvcviewer-controller/controllers/suite_test.go b/components/pvcviewer-controller/controllers/suite_test.go index a6fdf265..8845d304 100644 --- a/components/pvcviewer-controller/controllers/suite_test.go +++ b/components/pvcviewer-controller/controllers/suite_test.go @@ -40,7 +40,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/metrics/server" "sigs.k8s.io/controller-runtime/pkg/webhook" - kubefloworgv1alpha1 "github.com/kubeflow/kubeflow/components/pvc-viewer/api/v1alpha1" + kubefloworgv1alpha1 "github.com/kubeflow/notebooks/components/pvc-viewer/api/v1alpha1" //+kubebuilder:scaffold:imports ) diff --git a/components/pvcviewer-controller/controllers/test_utils.go b/components/pvcviewer-controller/controllers/test_utils.go index f10ca526..7c8c10ca 100644 --- a/components/pvcviewer-controller/controllers/test_utils.go +++ b/components/pvcviewer-controller/controllers/test_utils.go @@ -14,7 +14,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" - kubefloworgv1alpha1 "github.com/kubeflow/kubeflow/components/pvc-viewer/api/v1alpha1" + kubefloworgv1alpha1 "github.com/kubeflow/notebooks/components/pvc-viewer/api/v1alpha1" ) // Variables required for the tests utilities and passed by the test suite diff --git a/components/pvcviewer-controller/go.mod b/components/pvcviewer-controller/go.mod index bf7f53b9..7a6bb086 100644 --- a/components/pvcviewer-controller/go.mod +++ b/components/pvcviewer-controller/go.mod @@ -1,4 +1,4 @@ -module github.com/kubeflow/kubeflow/components/pvc-viewer +module github.com/kubeflow/notebooks/components/pvc-viewer go 1.22.2 diff --git a/components/pvcviewer-controller/main.go b/components/pvcviewer-controller/main.go index 6a0f688f..61a3549e 100644 --- a/components/pvcviewer-controller/main.go +++ b/components/pvcviewer-controller/main.go @@ -34,8 +34,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/metrics/server" "sigs.k8s.io/controller-runtime/pkg/webhook" - kubefloworgv1alpha1 "github.com/kubeflow/kubeflow/components/pvc-viewer/api/v1alpha1" - "github.com/kubeflow/kubeflow/components/pvc-viewer/controllers" + kubefloworgv1alpha1 "github.com/kubeflow/notebooks/components/pvc-viewer/api/v1alpha1" + "github.com/kubeflow/notebooks/components/pvc-viewer/controllers" //+kubebuilder:scaffold:imports ) diff --git a/components/tensorboard-controller/controllers/suite_test.go b/components/tensorboard-controller/controllers/suite_test.go index ef707450..18fdbec0 100644 --- a/components/tensorboard-controller/controllers/suite_test.go +++ b/components/tensorboard-controller/controllers/suite_test.go @@ -30,7 +30,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - tensorboardv1alpha1 "github.com/kubeflow/kubeflow/components/tensorboard-controller/api/v1alpha1" + tensorboardv1alpha1 "github.com/kubeflow/notebooks/components/tensorboard-controller/api/v1alpha1" //+kubebuilder:scaffold:imports ) diff --git a/components/tensorboard-controller/controllers/tensorboard_controller.go b/components/tensorboard-controller/controllers/tensorboard_controller.go index 4f7dd9c4..72c71a6b 100644 --- a/components/tensorboard-controller/controllers/tensorboard_controller.go +++ b/components/tensorboard-controller/controllers/tensorboard_controller.go @@ -37,8 +37,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" - reconcilehelper "github.com/kubeflow/kubeflow/components/tensorboard-controller/reconcilehelper" - tensorboardv1alpha1 "github.com/kubeflow/kubeflow/components/tensorboard-controller/api/v1alpha1" + tensorboardv1alpha1 "github.com/kubeflow/notebooks/components/tensorboard-controller/api/v1alpha1" + reconcilehelper "github.com/kubeflow/notebooks/components/tensorboard-controller/reconcilehelper" ) // TensorboardReconciler reconciles a Tensorboard object @@ -409,8 +409,8 @@ func extractPVCSubPath(path string) string { } } -//Searches a corev1.PodList for running pods and returns -//a running corev1.Pod (if exists) +// Searches a corev1.PodList for running pods and returns +// a running corev1.Pod (if exists) func findRunningPod(pods *corev1.PodList) corev1.Pod { for _, pod := range pods.Items { if pod.Status.Phase == "Running" { @@ -470,9 +470,9 @@ func generateNodeAffinity(affinity *corev1.Affinity, pvcname string, r *Tensorbo return nil } -//Checks the value of 'RWO_PVC_SCHEDULING' env var (if present in the environment) and returns -//'true' or 'false' accordingly. If 'RWO_PVC_SCHEDULING' is NOT present, then the value of the -//returned boolean is set to 'false', so that the scheduling functionality is off by default. +// Checks the value of 'RWO_PVC_SCHEDULING' env var (if present in the environment) and returns +// 'true' or 'false' accordingly. If 'RWO_PVC_SCHEDULING' is NOT present, then the value of the +// returned boolean is set to 'false', so that the scheduling functionality is off by default. func rwoPVCScheduling() (error, bool) { if value, exists := os.LookupEnv("RWO_PVC_SCHEDULING"); !exists || value == "false" || value == "False" || value == "FALSE" { return nil, false diff --git a/components/tensorboard-controller/go.mod b/components/tensorboard-controller/go.mod index 7f39d13e..9f8d9831 100644 --- a/components/tensorboard-controller/go.mod +++ b/components/tensorboard-controller/go.mod @@ -1,4 +1,4 @@ -module github.com/kubeflow/kubeflow/components/tensorboard-controller +module github.com/kubeflow/notebooks/components/tensorboard-controller go 1.17 diff --git a/components/tensorboard-controller/main.go b/components/tensorboard-controller/main.go index a6ec369d..abeaf0af 100644 --- a/components/tensorboard-controller/main.go +++ b/components/tensorboard-controller/main.go @@ -20,6 +20,7 @@ import ( "context" "flag" "os" + "sigs.k8s.io/controller-runtime/pkg/client" // Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.) @@ -34,8 +35,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/healthz" "sigs.k8s.io/controller-runtime/pkg/log/zap" - tensorboardv1alpha1 "github.com/kubeflow/kubeflow/components/tensorboard-controller/api/v1alpha1" - "github.com/kubeflow/kubeflow/components/tensorboard-controller/controllers" + tensorboardv1alpha1 "github.com/kubeflow/notebooks/components/tensorboard-controller/api/v1alpha1" + "github.com/kubeflow/notebooks/components/tensorboard-controller/controllers" //+kubebuilder:scaffold:imports ) From a9b08dea674a166b0d23169b381d8704fb6ed3d1 Mon Sep 17 00:00:00 2001 From: Asaad Balum Date: Sun, 16 Nov 2025 10:42:58 +0200 Subject: [PATCH 2/3] chore: Update PROJECT files to use kubeflow/notebooks paths - Updated all repo and API paths in PROJECT files - Changed pvcviewer projectName from 'pvc-viewer' to 'pvcviewer-controller' Addresses feedback from review Signed-off-by: Asaad Balum --- components/notebook-controller/PROJECT | 8 ++++---- components/pvcviewer-controller/PROJECT | 6 +++--- components/tensorboard-controller/PROJECT | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/components/notebook-controller/PROJECT b/components/notebook-controller/PROJECT index 9c6268aa..f35a5c43 100644 --- a/components/notebook-controller/PROJECT +++ b/components/notebook-controller/PROJECT @@ -2,7 +2,7 @@ domain: kubeflow.org layout: - go.kubebuilder.io/v3 projectName: notebook-controller -repo: github.com/kubeflow/kubeflow/components/notebook-controller +repo: github.com/kubeflow/notebooks/components/notebook-controller resources: - api: crdVersion: v1 @@ -10,20 +10,20 @@ resources: controller: true domain: kubeflow.org kind: Notebook - path: github.com/kubeflow/kubeflow/components/notebook-controller/api/v1 + path: github.com/kubeflow/notebooks/components/notebook-controller/api/v1 version: v1 - api: crdVersion: v1 namespaced: true domain: kubeflow.org kind: Notebook - path: github.com/kubeflow/kubeflow/components/notebook-controller/api/v1alpha1 + path: github.com/kubeflow/notebooks/components/notebook-controller/api/v1alpha1 version: v1alpha1 - api: crdVersion: v1 namespaced: true domain: kubeflow.org kind: Notebook - path: github.com/kubeflow/kubeflow/components/notebook-controller/api/v1beta1 + path: github.com/kubeflow/notebooks/components/notebook-controller/api/v1beta1 version: v1beta1 version: "3" diff --git a/components/pvcviewer-controller/PROJECT b/components/pvcviewer-controller/PROJECT index 4fd6c126..dcddbc19 100644 --- a/components/pvcviewer-controller/PROJECT +++ b/components/pvcviewer-controller/PROJECT @@ -1,8 +1,8 @@ domain: kubeflow.org layout: - go.kubebuilder.io/v4-alpha -projectName: pvc-viewer -repo: github.com/kubeflow/kubeflow/components/pvc-viewer +projectName: pvcviewer-controller +repo: github.com/kubeflow/notebooks/components/pvcviewer-controller resources: - api: crdVersion: v1 @@ -10,7 +10,7 @@ resources: controller: true domain: kubeflow.org kind: PVCViewer - path: github.com/kubeflow/kubeflow/components/pvc-viewer/api/v1alpha1 + path: github.com/kubeflow/notebooks/components/pvcviewer-controller/api/v1alpha1 version: v1alpha1 webhooks: defaulting: true diff --git a/components/tensorboard-controller/PROJECT b/components/tensorboard-controller/PROJECT index c7d31f68..54903056 100644 --- a/components/tensorboard-controller/PROJECT +++ b/components/tensorboard-controller/PROJECT @@ -2,7 +2,7 @@ layout: - go.kubebuilder.io/v3 projectName: tensorboard-controller -repo: github.com/kubeflow/kubeflow/components/tensorboard-controller +repo: github.com/kubeflow/notebooks/components/tensorboard-controller resources: - api: crdVersion: v1 @@ -11,6 +11,6 @@ resources: domain: kubeflow.org group: tensorboard kind: Tensorboard - path: github.com/kubeflow/kubeflow/components/tensorboard-controller/api/v1alpha1 + path: github.com/kubeflow/notebooks/components/tensorboard-controller/api/v1alpha1 version: v1alpha1 version: "3" From c4f7ee6f73c4d6b7e4102118f3de45cdfe2c52fd Mon Sep 17 00:00:00 2001 From: Mathew Wicks <5735406+thesuperzapper@users.noreply.github.com> Date: Thu, 27 Nov 2025 09:39:54 -0800 Subject: [PATCH 3/3] mathew: fix rename of `pvc-viewer` path Signed-off-by: Mathew Wicks <5735406+thesuperzapper@users.noreply.github.com> --- components/pvcviewer-controller/PROJECT | 2 +- .../pvcviewer-controller/controllers/pvcviewer_controller.go | 2 +- .../controllers/pvcviewer_controller_test.go | 2 +- components/pvcviewer-controller/controllers/suite_test.go | 2 +- components/pvcviewer-controller/controllers/test_utils.go | 2 +- components/pvcviewer-controller/go.mod | 2 +- components/pvcviewer-controller/main.go | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/components/pvcviewer-controller/PROJECT b/components/pvcviewer-controller/PROJECT index dcddbc19..89879880 100644 --- a/components/pvcviewer-controller/PROJECT +++ b/components/pvcviewer-controller/PROJECT @@ -1,7 +1,7 @@ domain: kubeflow.org layout: - go.kubebuilder.io/v4-alpha -projectName: pvcviewer-controller +projectName: pvc-viewer repo: github.com/kubeflow/notebooks/components/pvcviewer-controller resources: - api: diff --git a/components/pvcviewer-controller/controllers/pvcviewer_controller.go b/components/pvcviewer-controller/controllers/pvcviewer_controller.go index 29c1b5fe..5fb4a8f5 100644 --- a/components/pvcviewer-controller/controllers/pvcviewer_controller.go +++ b/components/pvcviewer-controller/controllers/pvcviewer_controller.go @@ -34,7 +34,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" - kubefloworgv1alpha1 "github.com/kubeflow/notebooks/components/pvc-viewer/api/v1alpha1" + kubefloworgv1alpha1 "github.com/kubeflow/notebooks/components/pvcviewer-controller/api/v1alpha1" ) // PVCViewerReconciler reconciles a PVCViewer object diff --git a/components/pvcviewer-controller/controllers/pvcviewer_controller_test.go b/components/pvcviewer-controller/controllers/pvcviewer_controller_test.go index c7a6cea0..900d2783 100644 --- a/components/pvcviewer-controller/controllers/pvcviewer_controller_test.go +++ b/components/pvcviewer-controller/controllers/pvcviewer_controller_test.go @@ -7,7 +7,7 @@ import ( // "strconv" - kubefloworgv1alpha1 "github.com/kubeflow/notebooks/components/pvc-viewer/api/v1alpha1" + kubefloworgv1alpha1 "github.com/kubeflow/notebooks/components/pvcviewer-controller/api/v1alpha1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" appsv1 "k8s.io/api/apps/v1" diff --git a/components/pvcviewer-controller/controllers/suite_test.go b/components/pvcviewer-controller/controllers/suite_test.go index 8845d304..1d52474d 100644 --- a/components/pvcviewer-controller/controllers/suite_test.go +++ b/components/pvcviewer-controller/controllers/suite_test.go @@ -40,7 +40,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/metrics/server" "sigs.k8s.io/controller-runtime/pkg/webhook" - kubefloworgv1alpha1 "github.com/kubeflow/notebooks/components/pvc-viewer/api/v1alpha1" + kubefloworgv1alpha1 "github.com/kubeflow/notebooks/components/pvcviewer-controller/api/v1alpha1" //+kubebuilder:scaffold:imports ) diff --git a/components/pvcviewer-controller/controllers/test_utils.go b/components/pvcviewer-controller/controllers/test_utils.go index 7c8c10ca..60080c44 100644 --- a/components/pvcviewer-controller/controllers/test_utils.go +++ b/components/pvcviewer-controller/controllers/test_utils.go @@ -14,7 +14,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" - kubefloworgv1alpha1 "github.com/kubeflow/notebooks/components/pvc-viewer/api/v1alpha1" + kubefloworgv1alpha1 "github.com/kubeflow/notebooks/components/pvcviewer-controller/api/v1alpha1" ) // Variables required for the tests utilities and passed by the test suite diff --git a/components/pvcviewer-controller/go.mod b/components/pvcviewer-controller/go.mod index 7a6bb086..ade708fc 100644 --- a/components/pvcviewer-controller/go.mod +++ b/components/pvcviewer-controller/go.mod @@ -1,4 +1,4 @@ -module github.com/kubeflow/notebooks/components/pvc-viewer +module github.com/kubeflow/notebooks/components/pvcviewer-controller go 1.22.2 diff --git a/components/pvcviewer-controller/main.go b/components/pvcviewer-controller/main.go index 61a3549e..e6aae5eb 100644 --- a/components/pvcviewer-controller/main.go +++ b/components/pvcviewer-controller/main.go @@ -34,8 +34,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/metrics/server" "sigs.k8s.io/controller-runtime/pkg/webhook" - kubefloworgv1alpha1 "github.com/kubeflow/notebooks/components/pvc-viewer/api/v1alpha1" - "github.com/kubeflow/notebooks/components/pvc-viewer/controllers" + kubefloworgv1alpha1 "github.com/kubeflow/notebooks/components/pvcviewer-controller/api/v1alpha1" + "github.com/kubeflow/notebooks/components/pvcviewer-controller/controllers" //+kubebuilder:scaffold:imports )