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 components/notebook-controller/PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,28 @@ 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
namespaced: true
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"
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions components/notebook-controller/controllers/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
)

Expand Down
2 changes: 1 addition & 1 deletion components/notebook-controller/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/kubeflow/kubeflow/components/notebook-controller
module github.com/kubeflow/notebooks/components/notebook-controller

go 1.17

Expand Down
10 changes: 5 additions & 5 deletions components/notebook-controller/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
6 changes: 3 additions & 3 deletions components/pvcviewer-controller/PROJECT
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
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
namespaced: true
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion components/pvcviewer-controller/controllers/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
2 changes: 1 addition & 1 deletion components/pvcviewer-controller/controllers/test_utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion components/pvcviewer-controller/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/kubeflow/kubeflow/components/pvc-viewer
module github.com/kubeflow/notebooks/components/pvc-viewer

go 1.22.2

Expand Down
4 changes: 2 additions & 2 deletions components/pvcviewer-controller/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
4 changes: 2 additions & 2 deletions components/tensorboard-controller/PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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" {
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion components/tensorboard-controller/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/kubeflow/kubeflow/components/tensorboard-controller
module github.com/kubeflow/notebooks/components/tensorboard-controller

go 1.17

Expand Down
5 changes: 3 additions & 2 deletions components/tensorboard-controller/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.)
Expand All @@ -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
)

Expand Down
Loading