Repository navigation
[sync]: Updated default workbench namespace, namespace creation logic - #1943
Merged
openshift-merge-bot[bot] merged 3 commits intoMay 16, 2025
Merged
Conversation
Contributor
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the You can disable this status message by setting the Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
SupportNeed help? Create a ticket on our support page for assistance with any issues or questions. Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
…pendatahub (opendatahub-io#1913) API Docs update Updated CRD bases Linting fixes
* update: namespace for workbenches - remove client.create call, done by AddResoruces() - set opendatahub.io/generated-namespace: true on namespace regardless platform - re-generated manifests Signed-off-by: Wen Zhou <wenzhou@redhat.com> * fix: typo --------- Signed-off-by: Wen Zhou <wenzhou@redhat.com>
zdtsw
force-pushed
the
jira_25135
branch
2 times, most recently
from
May 16, 2025 09:15
ba483a6 to
357f7ed
Compare
zdtsw
changed the title
CFSNM
suggested changes
May 16, 2025
| default: rhods-notebooks | ||
| description: Namespace for workbenches to be installed, configurable | ||
| only once when workbenches are enabled, defaults to "rhods-notebooks" | ||
| only once when workbenches are enabled, defaults to "opendatahub" |
| default: rhods-notebooks | ||
| description: Namespace for workbenches to be installed, configurable | ||
| only once when workbenches are enabled, defaults to "rhods-notebooks" | ||
| only once when workbenches are enabled, defaults to "opendatahub" |
| | `managementState` _[ManagementState](#managementstate)_ | Set to one of the following values:<br /><br />- "Managed" : the operator is actively managing the component and trying to keep it active.<br /> It will only upgrade the component if it is safe to do so<br /><br />- "Removed" : the operator is actively managing the component and will not install it,<br /> or if it is installed, the operator will try to remove it | | Enum: [Managed Removed] <br /> | | ||
| | `devFlags` _[DevFlags](#devflags)_ | Add developer fields | | | | ||
| | `workbenchNamespace` _string_ | Namespace for workbenches to be installed, configurable only once when workbenches are enabled, defaults to "rhods-notebooks" | rhods-notebooks | MaxLength: 63 <br />Pattern: `^([a-z0-9]([-a-z0-9]*[a-z0-9])?)?$` <br /> | | ||
| | `workbenchNamespace` _string_ | Namespace for workbenches to be installed, configurable only once when workbenches are enabled, defaults to "rhods-notesbooks" | rhods-notebooks | MaxLength: 63 <br />Pattern: `^([a-z0-9]([-a-z0-9]*[a-z0-9])?)?$` <br /> | |
- otherwise, it shows opendatahub for workbench in default Yaml/UI Signed-off-by: Wen Zhou <wenzhou@redhat.com>
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: CFSNM The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## rhoai #1943 +/- ##
==========================================
- Coverage 27.11% 27.05% -0.07%
==========================================
Files 171 171
Lines 11984 11984
==========================================
- Hits 3250 3242 -8
- Misses 8444 8452 +8
Partials 290 290 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
5 tasks done
kpunwatk
added a commit
to kpunwatk/opendatahub-operator
that referenced
this pull request
Sep 14, 2026
…#1943 Picks up the same fixes that were merged into the ODH upstream repo. Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
openshift-merge-bot Bot
pushed a commit
that referenced
this pull request
Sep 22, 2026
* feat: migrate TrustyAI from component to module Rewrites the TrustyAI module handler against the current ModuleHandler interface (PopulatePlatformModule/IsEnabled/BuildModuleCR signatures and ModuleConfig fields changed significantly since the previous attempt in PR #3643, which predates the DAG-orchestration and common action-framework refactors). Follows sparkoperator's handler as the template, since both are out-of-tree kustomize-based modules with their own dedicated operator image. - Add internal/controller/modules/trustyai/handler.go + handler_test.go - Add PlatformModules.TrustyAI field (DSC mode only for now; Platform/xKS mode deferred pending API updates, matching the original migration's scope decision) - Register TrustyAI in existingModules/moduleRunlevels (RL(32), after KServe's RL(31), since TrustyAI depends on KServe CRDs) - Remove TrustyAI from existingComponents/componentRunlevels and delete the legacy in-tree component controller and its monitoring resources - CRName uses componentApi.TrustyAIInstanceName ("default-trustyai"), now aligned with the trustyai-operator-module CRD's own singleton validation (see companion fix in trustyai-service-operator) * fix(trustyai): use current image var name, add RHOAI build-config exception RELATED_IMAGE_ODH_TRUSTYAI_SERVICE_IMAGE was renamed to RELATED_IMAGE_ODH_TRUSTYAI_SERVICE_PY_IMAGE (#4011) before this migration branch was rebased; the RelatedImages list still had the stale name. Also adds an RHOAI-Build-Config exception for the new RELATED_IMAGE_ODH_TRUSTYAI_MODULE_OPERATOR_IMAGE, matching the trainer/sparkoperator module operator images (RHOAIENG-80231, delivering in RHOAI 3.6 EA2). Confirmed via `make validate-related-images` locally: 2 errors -> 0. * docs: regenerate api-overview for TrustyAI module field make generate manifests-all api-docs picked up the new PlatformModules.TrustyAI field added in the previous commit. * fix(trustyai): register manifests-config entry, fix ManifestDir/ContextDir mismatch Two bugs causing "must build at directory: not a valid directory: evalsymlink failure on '/opt/manifests/trustyai-module-operator/default'" at deploy time: - manifests-config.yaml had no entry for the module at all, so `make get-manifests` never fetched it. Added trustyai-module-operator, reusing the exact same repo/ref pins as the existing trustyai (component) entry, since both mirrors already have trustyai-operator-module/ at those SHAs -- confirmed via the GitHub API before adding. - handler.go's ManifestDir was missing ContextDir: "default". Every other kustomize-based module (e.g. trainer) points sourcePath at the whole `config` directory and lets ContextDir select the `default` overlay at render time; PlatformModules.String() joins Path+ContextDir, so without it the platform looked for manifests directly under ManifestDir instead of ManifestDir/default -- the exact directory missing in the reported error. Verified end to end: `make get-manifests` now fetches trustyai-operator-module/config/{crd,rbac,manager,default} correctly, and `kustomize build opt/manifests/trustyai-module-operator/default` renders successfully. * fix(trustyai): align RBAC markers and e2e tests with module architecture RBAC markers for the trustyais CR belonged in internal/controller/modules (module-managed), not datasciencecluster; moved them accordingly with no change to generated output. Updated dag_ordering_test.go and resilience_test.go to treat TrustyAI as a module like the other already-migrated components (Trainer, Workbenches, Dashboard, AIHub), matching gaps found by comparing against PR #4000. * fix(trustyai): reuse existing trustyai manifests-config entry instead of a duplicate The old trustyai entry (sourcePath: config) pointed at the removed in-tree component manifests and had no remaining code consumer, so keeping a separate trustyai-module-operator entry alongside it was redundant. Repointed the existing entry's sourcePath at the module manifests and dropped the duplicate. * fix(trustyai): explicitly map permit fields instead of blind struct conversion BuildModuleCR converted the whole DSC-facing TrustyAICommonSpec into the module CR's spec via runtime.DefaultUnstructuredConverter. The DSC-facing API declares permitCodeExecution/permitOnline as a string enum ("allow"/"deny") while the module CRD declares them as bool, so the wholesale conversion projected a string into a field the module's typed client expects to be bool, breaking its watch/list reflector on existing CRs. Map the two permit fields explicitly with the string-to-bool conversion instead. Reported-by: Steven Tobin * fix(trustyai): bump rhoai manifest pin to pick up CR-naming fix The rhoai-3.6-ea.2 pin predated commit 5ed6709 (fix(module): align TrustyAI singleton CR name with sibling modules), so the deployed module CRD still required metadata.name == 'default' while BuildModuleCR creates 'default-trustyai', causing every apply to be rejected by the CRD's own CEL validation. Bumped to the branch's current tip, which already includes the fix (verified via GitHub compare API and by re-downloading manifests locally). The odh pin (opendatahub-io/trustyai-service-operator@incubation) still needs the same fix; that branch hasn't been re-synced from main since before the fix landed, so it's left unchanged pending that sync. Reported-by: Steven Tobin * fix(trustyai): switch odh manifest pin from incubation to main The incubation branch (opendatahub-io/trustyai-service-operator) is synced from that repo's own main via a separate, infrequent process (last sync 2026-08-05), and hasn't picked up the CR-naming CEL fix (commit 5ed6709, landed 2026-09-01) that the rhoai pin already has. Waiting on that sync is unbounded, and this file already has precedent for pinning odh directly at main (see the modelregistry entry), so switch to main@<sha> instead. Verified the pinned commit contains the fix by fetching the CRD directly and confirming the CEL rule reads 'default-trustyai', and by re-running `make get-manifests` + `kustomize build` locally. Reported-by: Steven Tobin * fix(trustyai): bump odh/rhoai manifest pins to pick up module operator fixes trustyai-service-operator#908 (RBAC watch verbs, /opt write permission, platform version handshake) has now propagated through both downstream sync chains: - odh: opendatahub-io/trustyai-service-operator#194 merged - rhoai: red-hat-data-services/trustyai-service-operator#1932 (into main) and #1934 (main into rhoai-3.6-ea.2) both merged Bumped both pins to the post-merge tips and verified locally: the "watch" verb is present on deployments/rolebindings in both ODH and RHOAI mode, kustomize build succeeds, and go build/test pass. Reported-by: Steven Tobin * fix(trustyai): remove redundant CRD-generating types now owned by the module TrustyAI's Go type still had +kubebuilder:object:root=true on TrustyAI/ TrustyAIList, plus the PlatformObject interface implementation and scheme registration. Since the CRD is now installed by trustyai-operator-module (from its own manifests), this caused opendatahub-operator to generate a second, competing CRD definition for the same GVK from a Go type that isn't kept in sync with the module's actual schema (already missing mcpGuardrailsMode and the default-trustyai singleton validation independently added on each side). Removed the top-level TrustyAI/TrustyAIList struct, scheme registration, and PlatformObject methods, keeping only the nested spec/status types and DSCTrustyAI/DSCTrustyAIStatus, matching the pattern already used by sibling modules (see sparkoperator_types.go). Updated tests/e2e/trustyai_test.go to use NewModuleTestCtx (GVK + instance name) instead of NewComponentTestCtx (which required a typed struct) -- this is the existing mechanism other module e2e tests (kserve_test.go, aigateway_test.go) already use for exactly this case. Verified via a full config/crd/bases wipe + make manifests that no components.platform.opendatahub.io_trustyais.yaml is generated anymore. * fix(trustyai): bump rhoai manifest pin to pick up #913 (services/prometheuses watch) trustyai-explainability/trustyai-service-operator#913 merged and has propagated through both red-hat-data-services sync hops (main, then rhoai-3.6-ea.2). Bumped the rhoai ref and verified locally: services and prometheuses RBAC rules now include watch. The odh pin is not bumped yet -- opendatahub-io/trustyai-service-operator#195 (the pull[bot] sync PR) already has the right content but hasn't merged. * fix(trustyai): temporarily point odh pin at canonical upstream repo opendatahub-io/trustyai-service-operator#195 (the pull[bot] sync PR bringing in #913's services/prometheuses watch fix) already has the right content as its head commit, but is stuck on the OWNERS approval gate while the approver is on PTO. Rather than wait, point the odh pin directly at trustyai-explainability/trustyai-service-operator (the canonical upstream #195 pulls from) at that same commit. Verified locally: make get-manifests resolves cleanly, RBAC role.yaml has watch on services/prometheuses, CRD CEL rule reads 'default-trustyai', kustomize build succeeds, go build/test pass. Switch back to the opendatahub-io mirror once #195 merges. * switch ODH manifest pin back to opendatahub-io mirror * bump(trustyai): rhoai manifest pin to pick up rhoai PR #1943 Picks up the same fixes that were merged into the ODH upstream repo. Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com> * bump(trustyai): manifest pins for #920/#921/#925 sync Pick up post-sync mirror SHAs: ODH main @0b428d2 (#197) and rhoai-3.6-ea.2 @5f278d7 (#1949), including the emptyDir/clearDir fix. Co-authored-by: Cursor <cursoragent@cursor.com> * bump(trustyai): update module operator image digest to latest build * sync manager image overrides and regenerate api docs * chore: resolve image digests after trustyai manifest sync * bump(trustyai): service operator image only; revert broad digest resolve Update RELATED_IMAGE_ODH_TRUSTYAI_SERVICE_OPERATOR_IMAGE to fix --metrics-cert-path crash. Reverts platform-wide resolve-image-digests from 4e0700d; module operator stays at e5cd204a (#925). * fix(trustyai): TrustyAI-only image pins at latest validated digests * fix(trustyai): drop unrelated data-registry rhoai digest from PR Keep manifests-config image pin changes TrustyAI-only; remove MOD_ARCH_DATA_REGISTRY rhoai block not in scope for #4051. Co-authored-by: Cursor <cursoragent@cursor.com> * Revert "fix(trustyai): drop unrelated data-registry rhoai digest from PR" Restore MOD_ARCH_DATA_REGISTRY rhoai mapping from upstream #4073 merge. * test(e2e): drop TrustyAI from platform-owned CRD validation TrustyAI is now an out-of-tree module; its CRD is installed by the module operator when enabled, not by the platform operator at startup. Co-authored-by: Cursor <cursoragent@cursor.com> * chore(manifests): bump trustyai rhoai ref after #1955 sync Pick up #926 module operator fixes on rhoai-3.6-ea.2 (RELATED_IMAGE mapping, manifest staging, memory limits). * chore(manifests): bump trustyai odh ref to pick up #926 fixes Sync opendatahub-io/trustyai-service-operator main to #202 merge (9c0ffa8). * chore(manifests): bump trustyai pins for #928 readiness fix - ODH main@feb5b94 (opendatahub-io #204) - RHOAI rhoai-3.6-ea.2@75a4af5 (#1956 / #928 on rhoai) - Module-operator image digest d2df18f5 (Konflux build for feb5b94) * chore(manifests): align TrustyAI module-operator image with build configs - ODH: quay.io/opendatahub/odh-trustyai-module-operator@b3cef1149 - RHOAI: quay.io/rhoai/odh-trustyai-module-operator-rhel9@51384d9610 - Remove stale rhoai_exceptions entry (RHOAIENG-80231 onboarded) Co-authored-by: Cursor <cursoragent@cursor.com> * feat(trustyai): propagate MCP Guardrails mode Signed-off-by: Rui Vieira <ruidevieira@googlemail.com> (cherry picked from commit 8a76d74) * chore(docs): regenerate api-overview after Ray/TrustyAI module migration Drop Ray and TrustyAI from the platform-owned Resource Types index so make api-docs matches CI (Ensure generated files are included). Co-authored-by: Cursor <cursoragent@cursor.com> * fix(trustyai): bump module refs to include mcpGuardrailsMode in CRD schema ODH: main@7838ba58fffca619610c6b260c4ec87c031d0a27 (was feb5b944...) RHOAI: rhoai-3.6-ea.2@9a3b7b9f4f936419451c833b70ba180fe03a3e61 (was 75a4af5b...) The previous refs lacked mcpGuardrailsMode in the TrustyAI CRD schema, causing deployment failures when trying to apply the field: "field not declared in schema". Newer upstream commits include this field. Fixes e2e test failure: "unable to patch components.platform.opendatahub.io/v1alpha1, Kind=TrustyAI default-trustyai: failed to create typed patch object: .spec.mcpGuardrailsMode: field not declared in schema" * fix(trustyai): bump module operator image digests to latest builds Update both ODH and RHOAI image digests to the latest trustyai-module-operator builds that include the MCP guardrails fix: - ODH: sha256:65cba5211000f9b13b87b2bd9f1fb052ea814e1826e53f498edd84209d877b6e (midstream incubation→stable sync by Rui, synced to ODH) - RHOAI: sha256:e6a0be61ecbedf259b80fc2a63ae8ee975aa18a6a6743538554b21bab9f7bd4c Previous digests were stale and not available in the registry, causing e2e test deployment failures with missing CRD fields. * test(trustyai): override ValidateOperandsOwnerReferences for modular architecture TrustyAI is now a module operator that deploys operands with different labels. Override the parent test implementation to use the correct TrustyAI-specific label 'app.kubernetes.io/part-of: trustyai' instead of the generic component label, and verify operands are owned by the TrustyAI CR by kind and name. * style(test): fix import order in trustyai_test.go * align the trusty tests to the module architecture * Align RHOAI TrustyAI Module operator with RHOAI manifests * Fix Missing Components CRD Handling test --------- Signed-off-by: Rui Vieira <ruidevieira@googlemail.com> Co-authored-by: Claude Haiku 4.5 <noreply@anthropic.com> Co-authored-by: Cursor <cursoragent@cursor.com> Co-authored-by: Rui Vieira <ruidevieira@googlemail.com> Co-authored-by: Steven Tobin <stobin@redhat.com> Co-authored-by: Marián Macik <mmacik@redhat.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
cherry-pick #1913
#1927
RHOAIENG-25135
How Has This Been Tested?
Screenshot or short clip
Merge criteria