kubeflow
/
notebooks
mirror of https://github.com/kubeflow/notebooks.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat(ws): set `status.pauseTime` on workspace (#26) 

* feat(ws): populate the status.pauseTime on the workspace

Signed-off-by: Adem Baccara <71262172+Adembc@users.noreply.github.com>

* test(ws): add unit test

Signed-off-by: Adem Baccara <71262172+Adembc@users.noreply.github.com>

* mathew commit 1

Signed-off-by: Mathew Wicks <5735406+thesuperzapper@users.noreply.github.com>

---------

Signed-off-by: Adem Baccara <71262172+Adembc@users.noreply.github.com>
Signed-off-by: Mathew Wicks <5735406+thesuperzapper@users.noreply.github.com>
Co-authored-by: Mathew Wicks <5735406+thesuperzapper@users.noreply.github.com>
This commit is contained in:
Adem Baccara 2024-08-06 02:42:39 +01:00 committed by GitHub
parent e4e0aff6d6
commit 38b8955d68
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 48 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
workspaces/controller/internal/controller/workspace_controller.go
View File

@ -371,10 +371,6 @@ func (r *WorkspaceReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
}
}
//
// TODO: figure out how to set `status.pauseTime`, it will probably have to be done in a webhook
//
// update Workspace status
workspaceStatus, err := r.generateWorkspaceStatus(ctx, log, workspace, pod, statefulSet)
if err != nil {
@ -927,6 +923,18 @@ func generateService(workspace *kubefloworgv1beta1.Workspace, imageConfigSpec ku
func (r *WorkspaceReconciler) generateWorkspaceStatus(ctx context.Context, log logr.Logger, workspace *kubefloworgv1beta1.Workspace, pod *corev1.Pod, statefulSet *appsv1.StatefulSet) (kubefloworgv1beta1.WorkspaceStatus, error) {
status := workspace.Status
// if workspace is paused, update the `status.pauseTime`
// NOTE: when the workspace is not paused, the pauseTime should be 0
if *workspace.Spec.Paused {
if status.PauseTime == 0 {
status.PauseTime = metav1.Now().Unix()
}
} else {
if status.PauseTime != 0 {
status.PauseTime = 0
}
}
// cases where the Pod does not exist
if pod == nil {
// STATUS: Paused

38
workspaces/controller/internal/controller/workspace_controller_test.go
View File

@ -20,6 +20,8 @@ import (
"fmt"
"time"
"k8s.io/utils/ptr"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
@ -130,6 +132,38 @@ var _ = Describe("Workspace Controller", func() {
workspace := NewExampleWorkspace1(workspaceName, namespaceName, workspaceKindName)
Expect(k8sClient.Create(ctx, workspace)).To(Succeed())
By("pausing the Workspace")
patch := client.MergeFrom(workspace.DeepCopy())
newWorkspace := workspace.DeepCopy()
newWorkspace.Spec.Paused = ptr.To(true)
Expect(k8sClient.Patch(ctx, newWorkspace, patch)).To(Succeed())
By("setting the Workspace `status.pauseTime` to the current time")
tolerance := int64(5)
currentTime := time.Now().Unix()
Eventually(func() (int64, error) {
err := k8sClient.Get(ctx, types.NamespacedName{Name: workspaceName, Namespace: namespaceName}, workspace)
if err != nil {
return 0, err
}
return workspace.Status.PauseTime, nil
}, timeout, interval).Should(BeNumerically("~", currentTime, tolerance))
By("un-pausing the Workspace")
patch = client.MergeFrom(workspace.DeepCopy())
newWorkspace = workspace.DeepCopy()
newWorkspace.Spec.Paused = ptr.To(false)
Expect(k8sClient.Patch(ctx, newWorkspace, patch)).To(Succeed())
By("setting the Workspace `status.pauseTime` to 0")
Eventually(func() (int64, error) {
err := k8sClient.Get(ctx, types.NamespacedName{Name: workspaceName, Namespace: namespaceName}, workspace)
if err != nil {
return 0, err
}
return workspace.Status.PauseTime, nil
}, timeout, interval).Should(BeZero())
By("creating a StatefulSet")
statefulSetList := &appsv1.StatefulSetList{}
Eventually(func() ([]appsv1.StatefulSet, error) {
@ -138,7 +172,7 @@ var _ = Describe("Workspace Controller", func() {
return nil, err
}
return statefulSetList.Items, nil
}).Should(HaveLen(1))
}, timeout, interval).Should(HaveLen(1))
// TODO: use this to get the StatefulSet
//statefulSet := statefulSetList.Items[0]
@ -151,7 +185,7 @@ var _ = Describe("Workspace Controller", func() {
return nil, err
}
return serviceList.Items, nil
}).Should(HaveLen(1))
}, timeout, interval).Should(HaveLen(1))
// TODO: use this to get the Service
//service := serviceList.Items[0]