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

RHOAIENG-1724-Add V2_LAUNCHER_IMAGE and V2_DRIVER_IMAGE for dspa api server #543

Merged
merged 4 commits into from
Jan 18, 2024

Conversation

VaniHaripriya
Copy link
Contributor

@VaniHaripriya VaniHaripriya commented Jan 15, 2024

The issue resolved by this Pull Request:

Resolves RHOAIENG-1724

Description of your changes:

Added V2_LAUNCHER_IMAGE and V2_DRIVER_IMAGE params for dspa api server so that users can specify the kfp launcher and driver image when submitting a DSPA.

Testing instructions

Deploy DSPO

# git clone and checkout the PR branch
make deploy IMG=quay.io/opendatahub/data-science-pipelines-operator:pr-543

Create DSPA instance using dspa_simple_v2.yaml file which has the newly added fields kfpLauncherImage and driverImage.

Checklist

  • 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

@dsp-developers
Copy link
Contributor

A new image has been built to help with testing out this PR: quay.io/opendatahub/data-science-pipelines-operator:pr-543
An OCP cluster where you are logged in as cluster admin is required.

To use this image run the following:

cd $(mktemp -d)
git clone git@github.com:opendatahub-io/data-science-pipelines-operator.git
cd data-science-pipelines-operator/
git fetch origin pull/543/head
git checkout -b pullrequest 197acc7e4965f2259bffa23cd661d442a04fb517
make deploy IMG="quay.io/opendatahub/data-science-pipelines-operator:pr-543"

More instructions here on how to deploy and test a Data Science Pipelines Application.

@dsp-developers
Copy link
Contributor

Change to PR detected. A new PR build was completed.
A new image has been built to help with testing out this PR: quay.io/opendatahub/data-science-pipelines-operator:pr-543

@dsp-developers
Copy link
Contributor

Change to PR detected. A new PR build was completed.
A new image has been built to help with testing out this PR: quay.io/opendatahub/data-science-pipelines-operator:pr-543

…server

Updated cases to resolve functest errors

Removed unwanted env vars
@dsp-developers
Copy link
Contributor

Change to PR detected. A new PR build was completed.
A new image has been built to help with testing out this PR: quay.io/opendatahub/data-science-pipelines-operator:pr-543

Comment on lines 486 to 487
APIServerKFPLauncherImagePath := p.GetImageForComponent(dsp, config.APIServerKFPLauncherImagePath, config.APIServerKFPLauncherImagePathV2Argo, config.APIServerKFPLauncherImagePathV2Tekton)
APIServerDriverImagePath := p.GetImageForComponent(dsp, config.APIServerDriverImagePath, config.APIServerDriverImagePathV2Argo, config.APIServerDriverImagePathV2Tekton)
Copy link
Contributor

Choose a reason for hiding this comment

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

we don't need to set the v2 tekton, and v1 parameters, we can just directly use
config.APIServerDriverImagePathV2Argo and config.APIServerKFPLauncherImagePathV2Argo, if you notice in the go template, these images are only utilized for v2 argo

Comment on lines 111 to 112
KFPLauncherImage string `json:"kfpLauncherImage,omitempty"`
DriverImage string `json:"driverImage,omitempty"`
Copy link
Contributor

Choose a reason for hiding this comment

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

these are argo specific, I'm wondering if we should put this in a sub argo field like:

spec: 
  apiServer:
    ...
    V2Argo:
      KFPLauncherImage: ...
      DriverImage: ...

@gregsheremeta / @gmfrasca thoughts?

Copy link
Member

Choose a reason for hiding this comment

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

I'm not sure if nesting this would add some unnessesary complexity but I do like the idea of denoting they're Argo related. Perhaps naming them ArgoLauncherImage and ArgoDriverImage would be a good compromise?

Copy link
Member

@gmfrasca gmfrasca Jan 16, 2024

Choose a reason for hiding this comment

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

another consideration for @HumairAK 's suggestion would be that we would need to/should move the Tekton-specific images (ie MoveResultsImage) to their own sub-item

Copy link
Contributor

Choose a reason for hiding this comment

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

I like both of Giulio's suggestions. Nothing else to add.

Copy link
Contributor

Choose a reason for hiding this comment

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

let's just go with Argo* naming and not do the nesting

@dsp-developers
Copy link
Contributor

Change to PR detected. A new PR build was completed.
A new image has been built to help with testing out this PR: quay.io/opendatahub/data-science-pipelines-operator:pr-543

@gregsheremeta
Copy link
Contributor

/lgtm

@VaniHaripriya VaniHaripriya changed the base branch from dspv2 to main January 18, 2024 16:23
@openshift-ci openshift-ci bot removed the lgtm label Jan 18, 2024
@dsp-developers
Copy link
Contributor

Change to PR detected. A new PR build was completed.
A new image has been built to help with testing out this PR: quay.io/opendatahub/data-science-pipelines-operator:pr-543

1 similar comment
@dsp-developers
Copy link
Contributor

Change to PR detected. A new PR build was completed.
A new image has been built to help with testing out this PR: quay.io/opendatahub/data-science-pipelines-operator:pr-543

@dsp-developers
Copy link
Contributor

Change to PR detected. A new PR build was completed.
A new image has been built to help with testing out this PR: quay.io/opendatahub/data-science-pipelines-operator:pr-543

@dsp-developers
Copy link
Contributor

Change to PR detected. A new PR build was completed.
A new image has been built to help with testing out this PR: quay.io/opendatahub/data-science-pipelines-operator:pr-543

Copy link
Contributor

openshift-ci bot commented Jan 18, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: amadhusu, gmfrasca

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 29d74f9 into opendatahub-io:main Jan 18, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants