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

NO-JIRA: chore(nbcs): run make generate in components/notebook-controller to update the yamls #392

Merged

Conversation

jiridanek
Copy link
Member

@jiridanek jiridanek commented Sep 25, 2024

Run make generate in the project directory, commit the result

Description

It appears that this was not run in a while and therefore the code got out of sync with the generated yamls.

How Has This Been Tested?

  • Github Actions

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

@jiridanek
Copy link
Member Author

/cherrypick stable

@openshift-cherrypick-robot

@jiridanek: once the present PR merges, I will cherry-pick it on top of stable in a new PR and assign it to you.

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-sigs/prow repository.

@jiridanek
Copy link
Member Author

/cherrypick v1.9-branch

@openshift-cherrypick-robot

@jiridanek: once the present PR merges, I will cherry-pick it on top of v1.9-branch in a new PR and assign it to you.

In response to this:

/cherrypick v1.9-branch

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-sigs/prow repository.

@jstourac
Copy link
Member

/lgtm

Should we consider to run this periodically somehow? 🤔

@jiridanek
Copy link
Member Author

jiridanek commented Sep 26, 2024

Should we consider to run this periodically somehow? 🤔

There should be a CI check that will fail if manifests are out-of-date, ideally. This is something that a go developer is supposed to run before a commit. Could be a pre-commit check, also.

Here's intro blog, let's learn Go as if it was 2014 ;P https://go.dev/blog/generate

@jiridanek
Copy link
Member Author

/cherrypick main

@openshift-cherrypick-robot

@jiridanek: once the present PR merges, I will cherry-pick it on top of main in a new PR and assign it to you.

In response to this:

/cherrypick main

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-sigs/prow repository.

@atheo89
Copy link
Member

atheo89 commented Oct 2, 2024

/hold

Hey Jiri, could you switch the target branch to main please?

@openshift-ci openshift-ci bot added the do-not-merge/hold Do not merge this PR label Oct 2, 2024
@jiridanek jiridanek changed the base branch from v1.7-branch to v1.9-branch October 2, 2024 08:37
@openshift-ci openshift-ci bot removed the lgtm label Oct 2, 2024
Copy link

openshift-ci bot commented Oct 2, 2024

New changes are detected. LGTM label has been removed.

@jiridanek
Copy link
Member Author

jiridanek commented Oct 2, 2024

Rebased, I'll go test it now.

  • quay.io/opendatahub/kubeflow-notebook-controller:pr-392
  • quay.io/opendatahub/odh-notebook-controller:pr-392

@jiridanek
Copy link
Member Author

I checked that on https://console-openshift-console.apps.ods-qe-psi-06 cluster, the basic nbc functionality still works, I can spawn notebooks from dashboard without problems. I had issue with oauth proxy because we still don't have the ocp 4.16 fips compatible oauth proxy in downstream manifests, so I had to update the oauth-proxy by hand first before I was able to connect to the notebook.

/unhold
/approve

@openshift-ci openshift-ci bot removed the do-not-merge/hold Do not merge this PR label Oct 2, 2024
Copy link

openshift-ci bot commented Oct 2, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jiridanek

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

@jiridanek
Copy link
Member Author

/cherrypick main

@openshift-cherrypick-robot

@jiridanek: once the present PR merges, I will cherry-pick it on top of main in a new PR and assign it to you.

In response to this:

/cherrypick main

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-sigs/prow repository.

@atheo89
Copy link
Member

atheo89 commented Oct 2, 2024

I’m holding off because main is now the default branch, and all pull requests will target it. We won’t be doing cherry-picks anymore unless there’s a specific reason to hold something on main. Periodically, we’ll sync the changes to v1.9 using GitHub Actions.

@harshad16, I’m not sure if using cherrypick main might cause any issues with the git commit history. If it won’t, then I’m okay with proceeding.

@atheo89
Copy link
Member

atheo89 commented Oct 2, 2024

Here is a PR that introduce on the repo this sync #404 among the branches. No cherry-picks anymore 🙂

@openshift-merge-bot openshift-merge-bot bot merged commit fa442a1 into opendatahub-io:v1.9-branch Oct 2, 2024
14 checks passed
@openshift-cherrypick-robot

@jiridanek: new pull request created: #405

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-sigs/prow repository.

@openshift-cherrypick-robot

@jiridanek: base branch (v1.9-branch) needs to differ from target branch (v1.9-branch)

In response to this:

/cherrypick v1.9-branch

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-sigs/prow repository.

@openshift-cherrypick-robot

@jiridanek: new pull request created: #407

In response to this:

/cherrypick main

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-sigs/prow repository.

@harshad16
Copy link
Member

I’m not sure if using #392 (comment) might cause any issues with the git commit history. If it won’t, then I’m okay with proceeding.

i think , we can merge, it would cause now additional commits for same change, when we sync v1.9-branch with main. anyhow now that this PR is already merged ,it would be okay to do so.
and lets in future, focus on default PR to main and only Patch PRs to v1.9-branch.

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