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.

Sign up for GitHub

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

Jump to bottom

[sync]: change from incubation to rhoai + dummy change #1357

Merged
merged 3 commits into from
Nov 11, 2024
Merged

[sync]: change from incubation to rhoai + dummy change #1357

merged 3 commits into from
Nov 11, 2024

Conversation

zdtsw
Copy link
Member

@zdtsw zdtsw commented Nov 8, 2024 •
edited
Loading

Description

cherry-pick ODH change from incubation

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

How Has This Been Tested?

Screenshot or short clip

Merge criteria

  • You have read the contributors guide.
  • Commit messages are meaningful - have a clear and concise summary and detailed explanation of what was changed and why.
  • Pull Request contains a description of the solution, a link to the JIRA issue, and to any dependent or related Pull Request.
  • 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

zdtsw and others added 2 commits November 8, 2024 09:42
@zdtsw
fix: ensure input CAbundle always end with a newline (opendatahub-io#…
7f78d72 
…1339)

* fix: ensure input CAbundle always end with a newline

- missing newline will cause problem when inject data into configmap
- this happens when user use kustomize with their own CA for DSCI, it set to use |- not |
- fix lint

Signed-off-by: Wen Zhou <[email protected]>

* update: better way to add newline

Signed-off-by: Wen Zhou <[email protected]>

---------

Signed-off-by: Wen Zhou <[email protected]>
(cherry picked from commit 656d53e)
@dhirajsb @zdtsw
fix: add check to remove old kube-rbac-proxy container in modelregist…
a5771c8 
…ry operator, fixes RHOAIENG-15328 (opendatahub-io#1341)

* fix: add check to remove old kube-rbac-proxy container in modelregistry operator, fixes RHOAIENG-15328

Signed-off-by: Dhiraj Bokde <[email protected]>

* update: remove check in ModelReg code, add it to upgrade logic

Signed-off-by: Wen Zhou <[email protected]>

---------

Signed-off-by: Dhiraj Bokde <[email protected]>
Signed-off-by: Wen Zhou <[email protected]>
Co-authored-by: Wen Zhou <[email protected]>
(cherry picked from commit 92251e4)
@zdtsw zdtsw added the rhoai label Nov 8, 2024
@zdtsw zdtsw changed the title Chore rhoai 4 [sync]: change from incubation to rhoai + dummy change Nov 8, 2024
@zdtsw
fix: cherry-pick error
975469f 
- remove new logger
- dummy: request from devops to verify auto-sync

Signed-off-by: Wen Zhou <[email protected]>
@ykaliuta
Copy link
Contributor

ykaliuta commented Nov 8, 2024

Is "dummy change" required for the PR (Hint: git commit --allow-empty)

@zdtsw
Copy link
Member Author

zdtsw commented Nov 8, 2024

Is "dummy change" required for the PR (Hint: git commit --allow-empty)

i am asked to explicitly do a change in that file as a dummy commit.

@ykaliuta
Copy link
Contributor

ykaliuta commented Nov 8, 2024

Is "dummy change" required for the PR (Hint: git commit --allow-empty)

i am asked to explicitly do a change in that file as a dummy commit.

🙀 Ok

@zdtsw zdtsw removed the request for review from jackdelahunt November 8, 2024 10:26
@zdtsw
Copy link
Member Author

zdtsw commented Nov 8, 2024

/test opendatahub-operator-e2e

@zdtsw zdtsw enabled auto-merge (squash) November 10, 2024 13:56
@zdtsw
Copy link
Member Author

zdtsw commented Nov 10, 2024

will need an approve to get this one out

@openshift-ci openshift-ci bot added the lgtm label Nov 11, 2024
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Nov 11, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lburgazzoli

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

@openshift-merge-bot openshift-merge-bot bot merged commit b6124ef into opendatahub-io:rhoai Nov 11, 2024
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lburgazzoli lburgazzoli lburgazzoli approved these changes

@VaishnaviHire VaishnaviHire Awaiting requested review from VaishnaviHire

@ykaliuta ykaliuta Awaiting requested review from ykaliuta

Assignees

@lburgazzoli lburgazzoli

Labels
approved lgtm rhoai rhoai-2.16
Projects
ODH Platform Planning
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@zdtsw @ykaliuta @lburgazzoli @dhirajsb