From 86846b603eccb362c4dbb0d261cdec7d509ebfe6 Mon Sep 17 00:00:00 2001 From: Asaad Balum Date: Sun, 2 Nov 2025 12:34:37 +0200 Subject: [PATCH] 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 1e88a4604..f134b0349 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 d32cfb458..8a40c0640 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 f76a13648..14a95d46a 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 944dac3b3..f8e72f506 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 02d282113..ccb961286 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 da45ee802..965029ead 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 64369532d..c610a46f1 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 bad61fc29..af96888d5 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 619ff858d..034d42181 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 cc97b3e13..29c1b5fe4 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 76a2685e9..c7a6cea08 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 a6fdf2656..8845d304f 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 f10ca526a..7c8c10ca3 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 bf7f53b9d..7a6bb086a 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 6a0f688fc..61a3549e0 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 ef7074502..18fdbec06 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 4f7dd9c44..72c71a6bb 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 7f39d13ec..9f8d98318 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 a6ec369d0..abeaf0af6 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 )