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

feat: Add TrustyAI component #596

Merged
merged 6 commits into from
Oct 6, 2023

Conversation

ruivieira
Copy link
Member

Description

  • This PR adds TrustyAI as a component to the ODH operator.
  • This PR targets the incubation branch, rather than main (as feat: Add TrustyAI component #568 did).
  • TrustyAI operator manifests are now retrieved from the upstream release/* branches.

How Has This Been Tested?

Tested with sample DSC CR including the new

spec:
  components:
    trustyai:
      managementState: "Managed"

Merge criteria:

  • The commits are squashed in a cohesive manner and have meaningful messages.
  • 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

@ruivieira
Copy link
Member Author

cc @zdtsw @ykaliuta

components/trustyai/trustyai.go Outdated Show resolved Hide resolved
components/trustyai/trustyai.go Outdated Show resolved Hide resolved
components/trustyai/trustyai.go Outdated Show resolved Hide resolved
@zdtsw
Copy link
Member

zdtsw commented Oct 4, 2023

@ruivieira i did a test from your code base
imageParamMap still need update for:
so the idea is it should be in the format of "image_name:image_tag"
take https://github.com/red-hat-data-services/odh-manifests/blob/master/data-science-pipelines-operator/base/params.env as example.
so i would say https://github.com/trustyai-explainability/trustyai-service-operator/blob/release/1.10.1/config/base/params.env will be something like

trustyaiServiceImage=quay.io/trustyai/trustyai-service:v0.5.0
trustyaiOperatorImage=quay.io/trustyai/trustyai-service-operator:v1.10.1

then we do

var imageParamMap = map[string]string{
	"trustyaiServiceImage":  "RELATED_IMAGE_ODH_TRUSTYAI_SERVICE_IMAGE",
	"trustyaiOperatorImage": "RELATED_IMAGE_ODH_TRUSTYAI_OPERATOR_IMAGE",
}

@ruivieira
Copy link
Member Author

@ruivieira i did a test from your code base imageParamMap still need update for: so the idea is it should be in the format of "image_name:image_tag" take https://github.com/red-hat-data-services/odh-manifests/blob/master/data-science-pipelines-operator/base/params.env as example. so i would say https://github.com/trustyai-explainability/trustyai-service-operator/blob/release/1.10.1/config/base/params.env will be something like

trustyaiServiceImage=quay.io/trustyai/trustyai-service:v0.5.0
trustyaiOperatorImage=quay.io/trustyai/trustyai-service-operator:v1.10.1

then we do

var imageParamMap = map[string]string{
	"trustyaiServiceImage":  "RELATED_IMAGE_ODH_TRUSTYAI_SERVICE_IMAGE",
	"trustyaiOperatorImage": "RELATED_IMAGE_ODH_TRUSTYAI_OPERATOR_IMAGE",
}

Thanks @zdtsw. I'll change to env format upstream so it matches the expectation here.

@zdtsw
Copy link
Member

zdtsw commented Oct 4, 2023

@ruivieira i did a test from your code base imageParamMap still need update for: so the idea is it should be in the format of "image_name:image_tag" take https://github.com/red-hat-data-services/odh-manifests/blob/master/data-science-pipelines-operator/base/params.env as example. so i would say https://github.com/trustyai-explainability/trustyai-service-operator/blob/release/1.10.1/config/base/params.env will be something like

trustyaiServiceImage=quay.io/trustyai/trustyai-service:v0.5.0
trustyaiOperatorImage=quay.io/trustyai/trustyai-service-operator:v1.10.1

then we do

var imageParamMap = map[string]string{
	"trustyaiServiceImage":  "RELATED_IMAGE_ODH_TRUSTYAI_SERVICE_IMAGE",
	"trustyaiOperatorImage": "RELATED_IMAGE_ODH_TRUSTYAI_OPERATOR_IMAGE",
}

Thanks @zdtsw. I'll change to env format upstream so it matches the expectation here.

once that is done, i will do a final test and we can get this PR out

@zdtsw
Copy link
Member

zdtsw commented Oct 5, 2023

Add TrustyAI to "Integrated Components"
Version 1.10.2 includes the manifests with the params.env in the correct format
@ruivieira
Copy link
Member Author

@zdtsw We had to wait quite a bit for the CI to finish, after the params.env format change, but it's all done now and the new manifests are available at https://github.com/trustyai-explainability/trustyai-service-operator/tree/release/1.10.2 and corresponding images available on quay.io. The README.md was also updated.

@zdtsw
Copy link
Member

zdtsw commented Oct 6, 2023

test on local build, looks good
/lgtm

@openshift-ci openshift-ci bot added the lgtm label Oct 6, 2023
Copy link
Member

@zdtsw zdtsw left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci
Copy link

openshift-ci bot commented Oct 6, 2023

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: zdtsw
Once this PR has been reviewed and has the lgtm label, please assign vaishnavihire for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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

@zdtsw zdtsw merged commit affe7e8 into opendatahub-io:incubation Oct 6, 2023
5 of 6 checks passed
@VaishnaviHire VaishnaviHire added the incubating Added to issues that are currently incubating in ODH label Oct 10, 2023
VaishnaviHire pushed a commit to VaishnaviHire/opendatahub-operator that referenced this pull request Oct 20, 2023
* Add TrustyAI component
 -  Update README.md
 - Version 1.10.2 includes the manifests with the params.env in the correct format

(cherry picked from commit affe7e8)
@VaishnaviHire VaishnaviHire linked an issue Oct 26, 2023 that may be closed by this pull request
zdtsw pushed a commit to zdtsw-forking/opendatahub-operator that referenced this pull request Nov 1, 2023
- feat: Add TrustyAI component (opendatahub-io#596)
* Add TrustyAI component
 -  Update README.md
 - Version 1.10.2 includes the manifests with the params.env in the correct format

feat(dw): pass down applicationNamespace to ray and codeflare (opendatahub-io#619)
- rename ApplyImageParams to ApplyParams with new boolean parameter
- only enable ray and codeflare to set applicationNamespace

- Update TrustyAI Operator Variable (opendatahub-io#665)

- fix: CSV syntax and linter and main branch

Signed-off-by: Wen Zhou <wenzhou@redhat.com>
zdtsw pushed a commit to zdtsw-forking/opendatahub-operator that referenced this pull request Nov 1, 2023
- feat: Add TrustyAI component (opendatahub-io#596)
* Add TrustyAI component
 -  Update README.md
 - Version 1.10.2 includes the manifests with the params.env in the correct format

feat(dw): pass down applicationNamespace to ray and codeflare (opendatahub-io#619)
- rename ApplyImageParams to ApplyParams with new boolean parameter
- only enable ray and codeflare to set applicationNamespace

- Update TrustyAI Operator Variable (opendatahub-io#665)

- fix: CSV syntax and linter

- Remove redundant TrustyAI reconciliation (opendatahub-io#651)

Signed-off-by: Wen Zhou <wenzhou@redhat.com>
zdtsw added a commit that referenced this pull request Nov 1, 2023
- feat: Add TrustyAI component (#596)
* Add TrustyAI component
 -  Update README.md
 - Version 1.10.2 includes the manifests with the params.env in the correct format

feat(dw): pass down applicationNamespace to ray and codeflare (#619)
- rename ApplyImageParams to ApplyParams with new boolean parameter
- only enable ray and codeflare to set applicationNamespace

- Update TrustyAI Operator Variable (#665)

- fix: CSV syntax and linter

- Remove redundant TrustyAI reconciliation (#651)

Signed-off-by: Wen Zhou <wenzhou@redhat.com>
Co-authored-by: Rui Vieira <rcardoso@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
incubating Added to issues that are currently incubating in ODH lgtm
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Add Trusty AI component
3 participants