Skip to content

fix(trustyai): rename service image to RELATED_IMAGE_ODH_TRUSTYAI_SERVICE_PY_IMAGE - #4011

Merged
openshift-merge-bot[bot] merged 1 commit into
opendatahub-io:mainfrom
SudipSinha:trustyai-service-py-image
Aug 21, 2026
Merged

openshift-merge-bot[bot] merged 1 commit into
opendatahub-io:mainfrom
SudipSinha:trustyai-service-py-image

Conversation

@SudipSinha

@SudipSinha SudipSinha commented Aug 21, 2026 •

Copy link
Copy Markdown
Member

Description

Rename RELATED_IMAGE_ODH_TRUSTYAI_SERVICE_IMAGE to RELATED_IMAGE_ODH_TRUSTYAI_SERVICE_PY_IMAGE in the TrustyAI image param map to align with the upstream trustyai-service-operator.

Related:

  1. fix(trustyai): update RELATED_IMAGE for odh-trustyai-service-py trustyai-explainability/trustyai-service-operator#887
  2. https://redhat.atlassian.net/browse/RHAISTRAT-130

Release tracking

Release: rhoai-3.6-EA1

E2E test suite update requirement

  • Skip requirement to update E2E test suite for this PR

E2E update requirement opt-out justification

This PR only renames an environment variable reference — no operator logic or behavior changes. No E2E test updates are required.

Summary by CodeRabbit

Bug Fixes

  • Updated the TrustyAI service image configuration to use the correct Python service image reference.
  • Added the image reference to the supported component configuration, improving deployment compatibility and ensuring the service uses the intended image.

@openshift-ci

openshift-ci Bot commented Aug 21, 2026

Copy link
Copy Markdown

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@coderabbitai

coderabbitai Bot commented Aug 21, 2026 •

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Central YAML (base), Organization UI (inherited)

Review profile: CHILL

Plan: Pro Plus

Run ID: f5223186-4108-4c9f-a331-4ad5f3557e0b

📥 Commits

Reviewing files that changed from the base of the PR and between 6c27622 and ba8524b.

📒 Files selected for processing (1)
  • component-params-env.yaml

Included review availability: Your plan provides up to 2 included reviews per hour; 1 remains after this review.


📝 Walkthrough

Walkthrough

The TrustyAI service image mapping now uses RELATED_IMAGE_ODH_TRUSTYAI_SERVICE_PY_IMAGE. The variable is also listed in the validation exceptions with its RHOAI 3.6 EA1 tracking note.

Estimated code review effort: 1 (Trivial) | ~2 minutes

Merge Risk: ⚪ Minimal · up to ba852

This PR only renames the TrustyAI service image environment-variable reference, with no stated operator behavior change; no actionable merge-blocking risk remains after normal checks and review.

🚥 Pre-merge checks | ✅ 10
✅ Passed checks (10 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly describes the TrustyAI service image parameter rename, which is the main change in the pull request.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Contribution Quality And Spam Detection ✅ Passed The diff is a code-specific two-file image-variable rename linked to an upstream PR and Jira issue; it adds no security or validation logic, so no required security/code-quality signal is present.
No Hardcoded Secrets ✅ Passed The PR changes only an environment-variable identifier and a YAML exception reason; added lines contain no credentials, secret assignments, private-key markers, credential URLs, or long base64 stri...
No Weak Cryptography ✅ Passed The diff only renames a TrustyAI image environment variable and adds YAML metadata; it introduces no cryptographic primitive, custom crypto, or secret comparison.
No Injection Vectors ✅ Passed The diff changes only a hardcoded image-key identifier and adds a static YAML exception; it introduces no SQL, shell execution, eval, unsafe YAML, or HTML sink (CWE-89, CWE-78, CWE-94, CWE-502, CWE...
No Privileged Containers ✅ Passed The diff only renames an image parameter and adds a validation exception; it adds no manifest or Dockerfile security settings, so no privileged-container condition is introduced.
No Sensitive Data In Logs ✅ Passed The diff changes only an image parameter mapping and YAML exception entry; it adds no logging calls, request bodies, credentials, tokens, or PII.

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.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@SudipSinha
SudipSinha marked this pull request as ready for review August 21, 2026 09:37
@SudipSinha
SudipSinha force-pushed the trustyai-service-py-image branch from 6c27622 to 995fd10 Compare August 21, 2026 09:38

@MarianMacik MarianMacik left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Related image validation check is failing because it references RHOAI-Build-Config from 3.5 branch. Please add a RHOAI exception for it in component-params-env.yaml.

@SudipSinha
SudipSinha force-pushed the trustyai-service-py-image branch from 995fd10 to ba8524b Compare August 21, 2026 11:29
@MarianMacik

Copy link
Copy Markdown
Member

@SudipSinha coincidentally #3984 merged so you can revert the last change, everything should work now.

…VICE_PY_IMAGE

Update trustyaiServiceImage mapping from RELATED_IMAGE_ODH_TRUSTYAI_SERVICE_IMAGE
to RELATED_IMAGE_ODH_TRUSTYAI_SERVICE_PY_IMAGE to align with the upstream
trustyai-service-operator.

Related: trustyai-explainability/trustyai-service-operator#887
Signed-off-by: Sudip Sinha <Sudip.Sinha@RedHat.com>

Signed-off-by: Sudip Sinha <Sudip.Sinha@RedHat.com>

Signed-off-by: Sudip Sinha <Sudip.Sinha@RedHat.com>

rh-pre-commit.version: 2.3.2
rh-pre-commit.check-secrets: ENABLED
@SudipSinha
SudipSinha force-pushed the trustyai-service-py-image branch from ba8524b to a238edb Compare August 21, 2026 11:40
@SudipSinha

Copy link
Copy Markdown
Member Author

@MarianMacik I've reverted the change, but the check is still failing.

@codecov

codecov Bot commented Aug 21, 2026 •

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 57.84%. Comparing base (31f4a31) to head (a238edb).
⚠️ Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #4011   +/-   ##
=======================================
  Coverage   57.84%   57.84%           
=======================================
  Files         173      173           
  Lines       13090    13090           
=======================================
  Hits         7572     7572           
  Misses       4907     4907           
  Partials      611      611           

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@MarianMacik MarianMacik left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed now.

@openshift-ci

openshift-ci Bot commented Aug 21, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: MarianMacik

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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 82bc7d9 into opendatahub-io:main Aug 21, 2026
25 of 26 checks passed
@github-project-automation github-project-automation Bot moved this from Todo to Done in ODH Platform Planning Aug 21, 2026
@SudipSinha
SudipSinha deleted the trustyai-service-py-image branch August 21, 2026 14:45
kpunwatk added a commit to kpunwatk/opendatahub-operator that referenced this pull request Sep 2, 2026
…eption

RELATED_IMAGE_ODH_TRUSTYAI_SERVICE_IMAGE was renamed to
RELATED_IMAGE_ODH_TRUSTYAI_SERVICE_PY_IMAGE (opendatahub-io#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.
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>
IKRedHat pushed a commit to IKRedHat/opendatahub-operator that referenced this pull request Oct 19, 2026
…VICE_PY_IMAGE (opendatahub-io#4011)

Update trustyaiServiceImage mapping from RELATED_IMAGE_ODH_TRUSTYAI_SERVICE_IMAGE
to RELATED_IMAGE_ODH_TRUSTYAI_SERVICE_PY_IMAGE to align with the upstream
trustyai-service-operator.

Related: trustyai-explainability/trustyai-service-operator#887
Signed-off-by: Sudip Sinha <Sudip.Sinha@RedHat.com>

Signed-off-by: Sudip Sinha <Sudip.Sinha@RedHat.com>

Signed-off-by: Sudip Sinha <Sudip.Sinha@RedHat.com>

rh-pre-commit.version: 2.3.2
rh-pre-commit.check-secrets: ENABLED
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.

3 participants