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]: changes from main branch #1603

Merged
merged 12 commits into from
Feb 10, 2025

Conversation

zdtsw
Copy link
Member

@zdtsw zdtsw commented Feb 3, 2025

Description

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 8 commits February 3, 2025 13:35
- suspend too many WARNING lines from "make bundle"
- remove sample config for components and monitoring

Signed-off-by: Wen Zhou <[email protected]>
(cherry picked from commit 4fe5bed)
- add rules for our API components and service which force alias to be named with suffix ctrl

Signed-off-by: Wen Zhou <[email protected]>
(cherry picked from commit 32d75a8)
* update: clean up old code before refactor

- remove reference we explicilty check on odhdashboardconfig and kserve
- remove customized config on controller QPS
- remove RemoveLabel which is not called anywhere

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

* update:

- remove function for upgrade cleanup introduced before 2.8
- remove flags to main: operator namespace and application namespace
  ( operator namespace is passing as env variable, app namespace is done by DSCI )

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

* fix: Auth CR is cluster-scoped no need to set namespace for request

- application namespace is removed from reconciler of dsci

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

* fix: wrong code for upgrade path + rebase error

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

---------

Signed-off-by: Wen Zhou <[email protected]>
(cherry picked from commit b0a0f87)
…am (opendatahub-io#1582)

* docs: update workflow and how we use two branchs for ODH and downstream

- add new doc for how workflow, label on PR, sync process
- update branch away from incubatin in github action and reference

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

* Update docs/sync_code.md

Co-authored-by: Gerard Ryan <[email protected]>

* revert: branch related test config

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

* fix: typo

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

---------

Signed-off-by: Wen Zhou <[email protected]>
Co-authored-by: Gerard Ryan <[email protected]>
(cherry picked from commit da75d42)
Signed-off-by: Wen Zhou <[email protected]>
(cherry picked from commit 46d8ba2)
Signed-off-by: Wen Zhou <[email protected]>
(cherry picked from commit f4c932b)
opendatahub-io#1585)

Jira: https://issues.redhat.com/browse/RHOAIENG-18931

Api sets default value to opendatahub, but without "omitempty" in
case of operator automatically creates
DSCI (upgrade.go:CreateDefaultDSCI), the resulting object contains
applicationsNamespace: "" and it's not defaulted by the api server
causing then problems like

```
Namespace "" is invalid: metadata.name: Required value: name or generateName is required
```

The problem was triggered by removing default value for command line
switch in the cleanup.

Fixes: b0a0f87 ("update: clean up old code before refactor (opendatahub-io#1494)")

Signed-off-by: Yauheni Kaliuta <[email protected]>
(cherry picked from commit 768539c)
@openshift-ci openshift-ci bot requested review from lphiri and MarianMacik February 3, 2025 12:50
@zdtsw zdtsw added the rhoai label Feb 3, 2025
@zdtsw zdtsw requested review from VaishnaviHire and removed request for lphiri and MarianMacik February 3, 2025 12:50
(cherry picked from commit 2384ada)
@zdtsw
Copy link
Member Author

zdtsw commented Feb 3, 2025

/test opendatahub-operator-e2e

@zdtsw
Copy link
Member Author

zdtsw commented Feb 4, 2025

/test opendatahub-operator-e2e

@VaishnaviHire
Copy link
Member

/test opendatahub-operator-e2e

Copy link

openshift-ci bot commented Feb 7, 2025

The following users are mentioned in OWNERS file(s) but are untrusted for the following reasons. One way to make the user trusted is to add them as members of the opendatahub-io org. You can then trigger verification by writing /verify-owners in a comment.

  • jctanner
    • User is not a member of the org. User is not a collaborator. Satisfy at least one of these conditions to make the user trusted.

@zdtsw
Copy link
Member Author

zdtsw commented Feb 8, 2025

/test opendatahub-operator-e2e

Copy link

codecov bot commented Feb 8, 2025

Codecov Report

Attention: Patch coverage is 0% with 26 lines in your changes missing coverage. Please review.

Project coverage is 20.44%. Comparing base (dd44dcd) to head (8cbdc87).
Report is 5 commits behind head on rhoai.

Files with missing lines Patch % Lines
pkg/upgrade/upgrade.go 0.00% 20 Missing ⚠️
.../dscinitialization/dscinitialization_controller.go 0.00% 2 Missing ⚠️
pkg/deploy/deploy.go 0.00% 2 Missing ⚠️
controllers/services/auth/auth_controller.go 0.00% 1 Missing ⚠️
controllers/webhook/webhook.go 0.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##            rhoai    #1603      +/-   ##
==========================================
+ Coverage   20.02%   20.44%   +0.41%     
==========================================
  Files         160      159       -1     
  Lines       10977    10806     -171     
==========================================
+ Hits         2198     2209      +11     
+ Misses       8544     8361     -183     
- Partials      235      236       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@VaishnaviHire
Copy link
Member

/lgtm

@VaishnaviHire
Copy link
Member

/lgtm

Copy link

openshift-ci bot commented Feb 10, 2025

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by:

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 4a194fc into opendatahub-io:rhoai Feb 10, 2025
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

5 participants