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

Sync v1.9 branch from main to get the latest changes ready for rhoai-nightly #420

Conversation

jiridanek
Copy link
Member

@jiridanek jiridanek commented Oct 16, 2024

git switch -c jd_sync_v1.9-branch_from_main origin/v1.9-branch
git pull --rebase=false origin main
# ... hack hack hack ...
cd components/odh-notebook-controller; make manifests
cd components/notebook-controller; make manifests
git merge --continue
git push fork HEAD

jiridanek and others added 13 commits October 2, 2024 09:46
…/cherry-pick-392-to-main

[main] NO-JIRA: chore(nbcs): run `make generate` in `components/notebook-controller` to update the yamls
…atahub-io#391)

* ```
bin/setup-envtest use 1.23 -p path
unable to find a version that was supported for platform darwin/arm64
```

* align with operator's and opendatahub-io/notebooks's kustomize version

* ```
make generate
GOBIN=/Users/jdanek/IdeaProjects/kubeflow/components/odh-notebook-controller/bin go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0
/Users/jdanek/IdeaProjects/kubeflow/components/odh-notebook-controller/bin/controller-gen object:headerFile="hack/boilerplate.go.txt" paths="./..."
panic: runtime error: invalid memory address or nil pointer dereference [recovered]
        panic: runtime error: invalid memory address or nil pointer dereference
[signal SIGSEGV: segmentation violation code=0x2 addr=0x0 pc=0x1008a00a4]
```

* manifest changes after regen

* apply the same changes for notebook-controller as for odh-notebook-controller previously
Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 6.1.0 to 7.0.5.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](peter-evans/create-pull-request@c5a7806...5e91468)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
…01603

[GHA] Update odh and notebook-controller with image main-7986030
…github_actions/peter-evans/create-pull-request-7.0.5

chore(gha): bump peter-evans/create-pull-request from 6.1.0 to 7.0.5
…egration_test.yaml

We don't have oc preinstalled on the new GitHub Actions runners that we were autoupdated to. Best to stick to kubectl.
NO-JIRA: fix(gha): replace oc with kubectl in notebook_controller_integration_test.yaml
Without this, the gha is flaky and may fail with

```
notebook.kubeflow.org/minimal-notebook created
Error from server (NotFound): statefulsets.apps "minimal-notebook" not found
```
NO-JIRA: fix(gha) improve robustness by checking for resource existence
@openshift-ci openshift-ci bot requested review from caponetto and jstourac October 16, 2024 18:04
@jiridanek
Copy link
Member Author

/cc @harshad16

@openshift-ci openshift-ci bot requested a review from harshad16 October 16, 2024 18:07
@jiridanek
Copy link
Member Author

When this is in, I'd want to create sync

red-hat-data-services/kubeflow@master...opendatahub-io:kubeflow:v1.9-branch

@jiridanek jiridanek force-pushed the jd_sync_v1.9-branch_from_main branch from 5eb6321 to 7afca5b Compare October 16, 2024 18:31
@jiridanek
Copy link
Member Author

Looks correct to me, so I'll push it onwards

/approve

it does not include the oauth-proxy revert yet as that was merged after I started the sync, so I'll do another sync right after.

Copy link

openshift-ci bot commented Oct 16, 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

/override ci/prow/odh-notebook-controller-e2e

no need to retest that, just merge!

@openshift-merge-bot openshift-merge-bot bot merged commit 16bc9fa into opendatahub-io:v1.9-branch Oct 16, 2024
15 checks passed
@jiridanek jiridanek deleted the jd_sync_v1.9-branch_from_main branch October 16, 2024 19:30
@harshad16
Copy link
Member

@jiridanek , why was this PR required from fork and made same as this PR #422 from main ?

@jiridanek
Copy link
Member Author

jiridanek commented Oct 17, 2024

Because we have digest updater running on both main and v1.9-branch. When the updater does updates on both branches, there will then be a conflict that needs to be resolved by hand. So automatic merge is failing.

When I did the sync again with the newly landed PR, the digest updater did not run in the meantime, so there were no conflicts, so I could do it straight in GitHub, without going through intermediate branch.

I could not use the sync GH Action from @atheo89 because only repo admins have permissions to trigger ghas by clicking button.

@atheo89
Copy link
Member

atheo89 commented Oct 17, 2024

Opened this PR to avoid this triggering issues in the future: #423
This allow the IDs from the approvers list on the OWNERS file to trigger the sync action.
ofc in case of conflicts we should create a handmade pr

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.

4 participants