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

UPSTREAM: <carry>: Fix for default Pipelineroot failures #51

Merged

Conversation

VaniHaripriya
Copy link

@VaniHaripriya VaniHaripriya commented Jun 4, 2024

Description of your changes:
Resolves RHOAIENG-7209

Fixed the issue with fetching the kfp-launcher default config when the provided pipelineroot is set via SDK or UI.

Testing instructions:

  • Deploy dspa using the dspa.pr-51.yaml in this PR.
  • While creating a pipeline run in the UI, provide the custom pipeline root in the parameters and the run should complete successfully.
  • Create another run without custom pipeline root and it should complete successfully.

Checklist:

@openshift-ci openshift-ci bot requested review from HumairAK and rimolive June 4, 2024 20:14
@dsp-developers
Copy link

Commit Checker results:

**NOTE**: These are the results of the commit checker scans. 
If these are not commits from upstream kfp, then please ensure
you adhere to the commit checker formatting
commitchecker verson unknown
Validating 0 commits between 6623b7cc19b13b371af67b209f965afdff47dfd4...d652c0d456bfc8580dc3e5df807095b3451b0157

@dsp-developers
Copy link

A set of new images have been built to help with testing out this PR:
API Server: quay.io/opendatahub/ds-pipelines-api-server:pr-51
DSP DRIVER: quay.io/opendatahub/ds-pipelines-driver:pr-51
DSP LAUNCHER: quay.io/opendatahub/ds-pipelines-launcher:pr-51
Persistence Agent: quay.io/opendatahub/ds-pipelines-persistenceagent:pr-51
Scheduled Workflow Manager: quay.io/opendatahub/ds-pipelines-scheduledworkflow:pr-51
MLMD Server: quay.io/opendatahub/mlmd-grpc-server:latest
MLMD Envoy Proxy: registry.redhat.io/openshift-service-mesh/proxyv2-rhel8:2.3.9-2
UI: quay.io/opendatahub/ds-pipelines-frontend:pr-51

@dsp-developers
Copy link

An OCP cluster where you are logged in as cluster admin is required.

The Data Science Pipelines team recommends testing this using the Data Science Pipelines Operator. Check here for more information on using the DSPO.

To use and deploy a DSP stack with these images (assuming the DSPO is deployed), first save the following YAML to a file named dspa.pr-51.yaml:

apiVersion: datasciencepipelinesapplications.opendatahub.io/v1alpha1
kind: DataSciencePipelinesApplication
metadata:
  name: pr-51
spec:
  dspVersion: v2
  apiServer:
    image: "quay.io/opendatahub/ds-pipelines-api-server:pr-51"
    argoDriverImage: "quay.io/opendatahub/ds-pipelines-driver:pr-51"
    argoLauncherImage: "quay.io/opendatahub/ds-pipelines-launcher:pr-51"
  persistenceAgent:
    image: "quay.io/opendatahub/ds-pipelines-persistenceagent:pr-51"
  scheduledWorkflow:
    image: "quay.io/opendatahub/ds-pipelines-scheduledworkflow:pr-51"
  mlmd:  
    deploy: true  # Optional component
    grpc:
      image: "quay.io/opendatahub/mlmd-grpc-server:latest"
    envoy:
      image: "registry.redhat.io/openshift-service-mesh/proxyv2-rhel8:2.3.9-2"
  mlpipelineUI:
    deploy: true  # Optional component 
    image: "quay.io/opendatahub/ds-pipelines-frontend:pr-51"
  objectStorage:
    minio:
      deploy: true
      image: 'quay.io/opendatahub/minio:RELEASE.2019-08-14T20-37-41Z-license-compliance'

Then run the following:

cd $(mktemp -d)
git clone git@github.com:opendatahub-io/data-science-pipelines.git
cd data-science-pipelines/
git fetch origin pull/51/head
git checkout -b pullrequest d652c0d456bfc8580dc3e5df807095b3451b0157
oc apply -f dspa.pr-51.yaml

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

@dsp-developers
Copy link

Commit Checker results:

**NOTE**: These are the results of the commit checker scans. 
If these are not commits from upstream kfp, then please ensure
you adhere to the commit checker formatting
commitchecker verson unknown
Validating 1 commits between 6623b7cc19b13b371af67b209f965afdff47dfd4...de8d2cdc20d20c2096ef839a7e62617558ffc4f9

UPSTREAM commit de8d2cd has invalid summary Fix Default Pipelineroot fails.

UPSTREAM commits are validated against the following regular expression:
  ^UPSTREAM: (revert: )?(([\w.-]+/[\w-.-]+)?: )?(\d+:|<carry>:|<drop>:)

UPSTREAM commit summaries should look like:

  UPSTREAM: <PR number|carry|drop>: description

UPSTREAM commits which revert previous UPSTREAM commits should look like:

  UPSTREAM: revert: <normal upstream format>

Examples of valid summaries:

  UPSTREAM: 12345: A kube fix
  UPSTREAM: <carry>: A carried kube change
  UPSTREAM: <drop>: A dropped kube change
  UPSTREAM: revert: 12345: A kube revert


@dsp-developers
Copy link

Commit Checker results:

**NOTE**: These are the results of the commit checker scans. 
If these are not commits from upstream kfp, then please ensure
you adhere to the commit checker formatting
commitchecker verson unknown
Validating 1 commits between 6623b7cc19b13b371af67b209f965afdff47dfd4...135d283734772908e79eb0bcb7c005fb4cd49a06

UPSTREAM commit 135d283 has invalid summary (fix):Default Pipelineroot fails.

UPSTREAM commits are validated against the following regular expression:
  ^UPSTREAM: (revert: )?(([\w.-]+/[\w-.-]+)?: )?(\d+:|<carry>:|<drop>:)

UPSTREAM commit summaries should look like:

  UPSTREAM: <PR number|carry|drop>: description

UPSTREAM commits which revert previous UPSTREAM commits should look like:

  UPSTREAM: revert: <normal upstream format>

Examples of valid summaries:

  UPSTREAM: 12345: A kube fix
  UPSTREAM: <carry>: A carried kube change
  UPSTREAM: <drop>: A dropped kube change
  UPSTREAM: revert: 12345: A kube revert


@dsp-developers
Copy link

Change to PR detected. A new PR build was completed.
A set of new images have been built to help with testing out this PR:
API Server: quay.io/opendatahub/ds-pipelines-api-server:pr-51
DSP DRIVER: quay.io/opendatahub/ds-pipelines-driver:pr-51
DSP LAUNCHER: quay.io/opendatahub/ds-pipelines-launcher:pr-51
Persistence Agent: quay.io/opendatahub/ds-pipelines-persistenceagent:pr-51
Scheduled Workflow Manager: quay.io/opendatahub/ds-pipelines-scheduledworkflow:pr-51
MLMD Server: quay.io/opendatahub/mlmd-grpc-server:latest
MLMD Envoy Proxy: registry.redhat.io/openshift-service-mesh/proxyv2-rhel8:2.3.9-2
UI: quay.io/opendatahub/ds-pipelines-frontend:pr-51

@HumairAK
Copy link

HumairAK commented Jun 5, 2024

@VaniHaripriya can you fix your commit messages as per the bot's recommendation

@VaniHaripriya VaniHaripriya changed the title (fix): Default Pipelineroot fails UPSTREAM: <carry>: Fix for default Pipelineroot failures Jun 5, 2024
@dsp-developers
Copy link

Commit Checker results:

**NOTE**: These are the results of the commit checker scans. 
If these are not commits from upstream kfp, then please ensure
you adhere to the commit checker formatting
commitchecker verson unknown
Validating 1 commits between 6623b7cc19b13b371af67b209f965afdff47dfd4...624df0954860b8ff5548b49e68868633b6d41eb0

@dsp-developers
Copy link

Change to PR detected. A new PR build was completed.
A set of new images have been built to help with testing out this PR:
API Server: quay.io/opendatahub/ds-pipelines-api-server:pr-51
DSP DRIVER: quay.io/opendatahub/ds-pipelines-driver:pr-51
DSP LAUNCHER: quay.io/opendatahub/ds-pipelines-launcher:pr-51
Persistence Agent: quay.io/opendatahub/ds-pipelines-persistenceagent:pr-51
Scheduled Workflow Manager: quay.io/opendatahub/ds-pipelines-scheduledworkflow:pr-51
MLMD Server: quay.io/opendatahub/mlmd-grpc-server:latest
MLMD Envoy Proxy: registry.redhat.io/openshift-service-mesh/proxyv2-rhel8:2.3.9-2
UI: quay.io/opendatahub/ds-pipelines-frontend:pr-51

@rimolive
Copy link

rimolive commented Jun 6, 2024

/lgtm

Ran the steps to test the PR and it ran successfuly.

@HumairAK
Copy link

HumairAK commented Jun 6, 2024

/approve

Copy link

openshift-ci bot commented Jun 6, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: HumairAK

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-ci openshift-ci bot added the approved label Jun 6, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit f3fbc2c into opendatahub-io:master Jun 6, 2024
3 checks passed
@dsp-developers
Copy link

Commit Checker results:

**NOTE**: These are the results of the commit checker scans. 
If these are not commits from upstream kfp, then please ensure
you adhere to the commit checker formatting
commitchecker verson unknown
Validating 0 commits between f3fbc2cfba32098ae1902ec8afa8d9661a2b30b0...624df0954860b8ff5548b49e68868633b6d41eb0

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.

4 participants