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

RHOAIENG-15741: Sync v1.9-branch branch with main branch #447

Merged

Conversation

jiridanek
Copy link
Member

@jiridanek jiridanek commented Nov 13, 2024

https://issues.redhat.com/browse/RHOAIENG-15741

git switch -c jd_merge_branch origin/v1.9-branch
git pull origin v1.9-branch
git fetch origin main
git merge --strategy-option=theirs origin/main

v1.9-branch...opendatahub-io:kubeflow:main

github-actions bot and others added 11 commits November 7, 2024 10:43
…03577

[GHA] Update odh and notebook-controller with image main-3f931d2
The version 1.23 is no longer supported [1] and only releases from
1.28 - 1.31 versions are supported. Based on the [2], the
OpenShift 4.13 (oldest we care about right now) is based on Kubernetes
in version 1.26, so let's allign to that version.

* [1] https://kubernetes.io/releases/
* [2] https://access.redhat.com/solutions/4870701
This is a followup of opendatahub-io#391 (1b2dd4f).

Without this, we can see the following failure during the e2e tests
execution:
```
make run-ci-e2e-tests
...
GOBIN=/home/jstourac/workspace/rhosai/odh/kubeflow/components/odh-notebook-controller/bin go install sigs.k8s.io/kustomize/v3/cmd/kustomize@v5.0.2
go: sigs.k8s.io/kustomize/v3/cmd/kustomize@v5.0.2: sigs.k8s.io/kustomize/v3/cmd/kustomize@v5.0.2: invalid version: unknown revision v3/cmd/kustomize/v5.0.2
make[1]: *** [Makefile:243: kustomize] Error 1
...
```
This caused that all e2e tests failed. After this fix, some e2e tests
pass. The other seem to fail on a problem unrelated to this one.
NO-JIRA: chore(nbcs): update tooling in controller's Makefiles - kubernetes and kustomize
…y image in CREATE events"

We have a better solution of blocking updates that
* are initiated by the odh-notebook-controller webhook itself
* that would lead to pod restart
* when the notebook is in running state and there is no external update that itself causes restart

This reverts commit 4a185e0.
… metadata value with pending-update reason

also a little unittest is added
…start

RHOAIENG-15335: feat(odh-nbc/webhook): don't initiate updates that would restart a running pod
@openshift-ci openshift-ci bot requested review from caponetto and jstourac November 13, 2024 09:43
@jiridanek jiridanek changed the title Jd merge branch RHOAIENG-15741: Sync v1.9-branch branch with main branch Nov 13, 2024
@jiridanek
Copy link
Member Author

/approve

Copy link

openshift-ci bot commented Nov 13, 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

@jstourac
Copy link
Member

LGTM, but this one is missing - #406 do we want to have it here also?

@jiridanek
Copy link
Member Author

LGTM, but this one is missing - #406 do we want to have it here also?

Thanks for checking; I wouldn't worry about getting it now, it does not affect downstream builds anyways. Will get it the next time we sync.

@jstourac
Copy link
Member

Okay, thanks

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Nov 13, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit adf190d into opendatahub-io:v1.9-branch Nov 13, 2024
15 checks passed
@jiridanek jiridanek deleted the jd_merge_branch branch November 13, 2024 11:33
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.

3 participants