Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add static label to notebook pods #265

Merged
merged 1 commit into from
Mar 14, 2024

Conversation

rkpattnaik780
Copy link

@rkpattnaik780 rkpattnaik780 commented Mar 7, 2024

Description

The PR enables notebook controller to add a static label to the Notebook pods. The labels should be added for newly created workbenches or workbenches that have been restarted.

How Has This Been Tested?

  • The image for odh-notebook-controller needs to be replaced with quay.io/rpattnai/odh-notebook-controller:nb-label. Eg
  • Create a new notebook. Upon checking the yaml for the notebook pod, you should be able to see the label opendatahub.io/workbenches: 'true'.

Merge criteria:

  • The commits are squashed in a cohesive manner and have meaningful messages.
  • Testing instructions have been added in the PR body (for PRs involving changes that are not immediately obvious).
  • The developer has manually tested the changes and verified that the changes work

@openshift-ci openshift-ci bot requested review from LaVLaS and VaishnaviHire March 7, 2024 12:28
@rkpattnaik780
Copy link
Author

/test odh-notebook-controller-unit

Copy link

openshift-ci bot commented Mar 7, 2024

@rkpattnaik780: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/odh-notebook-controller-unit 5fe062b link true /test odh-notebook-controller-unit

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@atheo89
Copy link
Member

atheo89 commented Mar 7, 2024

Hey Rama,

I've reviewed the changes on my cluster, and indeed, when spinning up a new notebook, the controller successfully assigns the label. However, I encountered an issue when restarting an old notebook created by the previous version of the odh-controller; it couldn't attach this label.

Furthermore, it seems necessary to modify the suite_test.go (potentially) and notebook_controller_test.go files to accommodate these new changes.

image

@harshad16
Copy link
Member

/lgtm
/approve

thanks 👍

Copy link

openshift-ci bot commented Mar 14, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: harshad16

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@harshad16 harshad16 merged commit d53909e into opendatahub-io:v1.7-branch Mar 14, 2024
4 of 6 checks passed
@harshad16
Copy link
Member

/cherrypick stable

@openshift-cherrypick-robot

@harshad16: #265 failed to apply on top of branch "stable":

Applying: feat: add static label to notebook pods
Using index info to reconstruct a base tree...
M	components/odh-notebook-controller/controllers/notebook_webhook.go
Falling back to patching base and 3-way merge...
Auto-merging components/odh-notebook-controller/controllers/notebook_webhook.go
CONFLICT (content): Merge conflict in components/odh-notebook-controller/controllers/notebook_webhook.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 feat: add static label to notebook pods
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick stable

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@shalberd
Copy link

shalberd commented Apr 3, 2024

new notebook pod / workbench label, interesting, thank you

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants