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>: Rebase code to kfp master branch - commit: 65d1d79fb7c77db076de0e9799516269c49e01a1 #134

Merged
merged 331 commits into from
Feb 12, 2025

Conversation

hbelmiro
Copy link

@hbelmiro hbelmiro commented Feb 5, 2025

Description of your changes:
Rebase code to kfp master branch - commit: kubeflow@65d1d79

This PR should depends:

Checklist:

DharmitD and others added 30 commits July 26, 2024 20:42
* test: Migrate SDK isort tests to GHA

Signed-off-by: ddalvi <ddalvi@redhat.com>

* test: Migrate SDK docformatter tests to GHA

Signed-off-by: ddalvi <ddalvi@redhat.com>

* test: Migrate SDK Component YAML tests to GHA

Signed-off-by: ddalvi <ddalvi@redhat.com>

---------

Signed-off-by: ddalvi <ddalvi@redhat.com>
Signed-off-by: ddalvi <ddalvi@redhat.com>
Signed-off-by: hbelmiro <helber.belmiro@gmail.com>
…w#10926)

* Moved kfp-kubernetes-execution-tests to GitHub Actions

Signed-off-by: hbelmiro <helber.belmiro@gmail.com>

* Removed Python versions matrix

Signed-off-by: hbelmiro <helber.belmiro@gmail.com>

---------

Signed-off-by: hbelmiro <helber.belmiro@gmail.com>
Signed-off-by: Humair Khan <HumairAK@users.noreply.github.com>
…m_job.utils.create_custom_training_job_from_component

Signed-off-by: Googler <nobody@google.com>
PiperOrigin-RevId: 657895789
Signed-off-by: Googler <nobody@google.com>
PiperOrigin-RevId: 658076101
Signed-off-by: Googler <nobody@google.com>
PiperOrigin-RevId: 658108277
…ow#11006)

* test: Add script and GitHub Action for kfp-kubernetes-library

Signed-off-by: Diego Lovison <diegolovison@gmail.com>

* Rename

Signed-off-by: Diego Lovison <diegolovison@gmail.com>

* Update bash to have sudo

Signed-off-by: Diego Lovison <diegolovison@gmail.com>

---------

Signed-off-by: Diego Lovison <diegolovison@gmail.com>
Signed-off-by: Googler <nobody@google.com>
PiperOrigin-RevId: 658877559
…_parameter examples (kubeflow#11062)

* Fixing incorrect typing in loop_parallism example

Signed-off-by: Oswaldo Gomez <oswaldo.gomez@roche.com>

* Fixing samples/core/loop_parameter example

Signed-off-by: Oswaldo Gomez <oswaldo.gomez@roche.com>

---------

Signed-off-by: Oswaldo Gomez <oswaldo.gomez@roche.com>
Co-authored-by: Oswaldo Gomez <oswaldo.gomez@roche.com>
Signed-off-by: Googler <nobody@google.com>
PiperOrigin-RevId: 658993845
Signed-off-by: hbelmiro <helber.belmiro@gmail.com>
Signed-off-by: Googler <nobody@google.com>
PiperOrigin-RevId: 659655574
Signed-off-by: Googler <nobody@google.com>
PiperOrigin-RevId: 659693795
Signed-off-by: Googler <nobody@google.com>
PiperOrigin-RevId: 659993682
Signed-off-by: Googler <nobody@google.com>
PiperOrigin-RevId: 660088225
…s. (kubeflow#11075)

Signed-off-by: KevinGrantLee <kglee@google.com>
Signed-off-by: Googler <nobody@google.com>
PiperOrigin-RevId: 660148123
Signed-off-by: Googler <nobody@google.com>
PiperOrigin-RevId: 660156029
Signed-off-by: Diego Lovison <diegolovison@gmail.com>
* feat(backend): move comp logic to workflow params

Signed-off-by: zazulam <m.zazula@gmail.com>
Co-authored-by: droctothorpe <mythicalsunlight@gmail.com>
Co-authored-by: andreafehrman <andrea.k.fehrman@vanderbilt.edu>
Co-authored-by: MonicaZhang1 <zhangmonica1@gmail.com>
Co-authored-by: kylekaminky <kyle.kaminky@gmail.com>
Co-authored-by: CarterFendley <carter.fendley@gmail.com>
Signed-off-by: zazulam <m.zazula@gmail.com>

* address pr comments

Signed-off-by: zazulam <m.zazula@gmail.com>

* Use function name instead of base name and address edge cases

Signed-off-by: droctothorpe <mythicalsunlight@gmail.com>
Co-authored-by: zazulam <m.zazula@gmail.com>

* Improve logic and update tests

Signed-off-by: droctothorpe <mythicalsunlight@gmail.com>
Co-authored-by: zazulam <m.zazula@gmail.com>

* POC hashing command and args

Signed-off-by: droctothorpe <mythicalsunlight@gmail.com>
Co-authored-by: zazulam <m.zazula@gmail.com>

* Add comments to clarify the logic

Signed-off-by: droctothorpe <mythicalsunlight@gmail.com>
Co-authored-by: zazulam <m.zazula@gmail.com>

* Hash entire PipelineContainerSpec

Signed-off-by: droctothorpe <mythicalsunlight@gmail.com>
Co-authored-by: zazulam <m.zazula@gmail.com>

---------

Signed-off-by: zazulam <m.zazula@gmail.com>
Signed-off-by: droctothorpe <mythicalsunlight@gmail.com>
Co-authored-by: droctothorpe <mythicalsunlight@gmail.com>
Co-authored-by: andreafehrman <andrea.k.fehrman@vanderbilt.edu>
Co-authored-by: MonicaZhang1 <zhangmonica1@gmail.com>
Co-authored-by: kylekaminky <kyle.kaminky@gmail.com>
Co-authored-by: CarterFendley <carter.fendley@gmail.com>
Signed-off-by: Googler <nobody@google.com>
PiperOrigin-RevId: 660985413
Signed-off-by: Googler <nobody@google.com>
PiperOrigin-RevId: 661332120
…red Data pipelines

Signed-off-by: Googler <nobody@google.com>
PiperOrigin-RevId: 661475667
…k_size in preview.custom_job.utils.create_custom_training_job_from_component

Signed-off-by: Googler <nobody@google.com>
PiperOrigin-RevId: 662242688
Signed-off-by: Giulio Frasca <gfrasca@redhat.com>
@openshift-ci openshift-ci bot requested review from DharmitD and rimolive February 10, 2025 20:36
Signed-off-by: Helber Belmiro <helber.belmiro@gmail.com>
@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-134
DSP DRIVER: quay.io/opendatahub/ds-pipelines-driver:pr-134
DSP LAUNCHER: quay.io/opendatahub/ds-pipelines-launcher:pr-134
Persistence Agent: quay.io/opendatahub/ds-pipelines-persistenceagent:pr-134
Scheduled Workflow Manager: quay.io/opendatahub/ds-pipelines-scheduledworkflow:pr-134
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-134

mprahl and others added 3 commits February 10, 2025 22:10
…ackend (kubeflow#11599)

This adds support for the following placeholders in the KFP backend:

- dsl.PIPELINE_JOB_NAME_PLACEHOLDER
- dsl.PIPELINE_JOB_RESOURCE_NAME_PLACEHOLDER
- dsl.PIPELINE_JOB_ID_PLACEHOLDER
- dsl.PIPELINE_TASK_NAME_PLACEHOLDER
- dsl.PIPELINE_TASK_ID_PLACEHOLDER

Resolves:
kubeflow#10453

Signed-off-by: mprahl <mprahl@users.noreply.github.com>
Signed-off-by: Daniel Dowler <12484302+dandawg@users.noreply.github.com>
# Conflicts:
#	backend/src/v2/cacheutils/cache.go
#	backend/src/v2/cmd/driver/main.go
#	backend/src/v2/driver/driver.go
@hbelmiro hbelmiro changed the title UPSTREAM <carry>: Rebase code to kfp master branch - commit: c100648fa8c36995eb6236ef402c37763d935da8 UPSTREAM <carry>: Rebase code to kfp master branch - commit: 65d1d79fb7c77db076de0e9799516269c49e01a1 Feb 11, 2025
@hbelmiro
Copy link
Author

Added new commits from upstream.

@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-134
DSP DRIVER: quay.io/opendatahub/ds-pipelines-driver:pr-134
DSP LAUNCHER: quay.io/opendatahub/ds-pipelines-launcher:pr-134
Persistence Agent: quay.io/opendatahub/ds-pipelines-persistenceagent:pr-134
Scheduled Workflow Manager: quay.io/opendatahub/ds-pipelines-scheduledworkflow:pr-134
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-134

@mprahl
Copy link

mprahl commented Feb 11, 2025

/cc @mprahl

…master

# Conflicts:
#	backend/third_party_licenses/apiserver.csv
#	backend/third_party_licenses/cache_server.csv
#	backend/third_party_licenses/driver.csv
#	backend/third_party_licenses/launcher.csv
#	backend/third_party_licenses/persistence_agent.csv
#	backend/third_party_licenses/swf.csv
#	backend/third_party_licenses/viewer.csv
#	go.mod
#	go.sum
@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-134
DSP DRIVER: quay.io/opendatahub/ds-pipelines-driver:pr-134
DSP LAUNCHER: quay.io/opendatahub/ds-pipelines-launcher:pr-134
Persistence Agent: quay.io/opendatahub/ds-pipelines-persistenceagent:pr-134
Scheduled Workflow Manager: quay.io/opendatahub/ds-pipelines-scheduledworkflow:pr-134
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-134

@rimolive
Copy link

Code LGTM, and I tested the images build by dsp-developers bot in a testing environment. iris-pipeline example ran fine.

However, in my testing environment, the scheduled-workflow controller pod is always restarting with the following message:

time="2025-02-12T15:46:51Z" level=info msg="Connecting the API server over GRPC at: ml-pipeline:8887"
time="2025-02-12T15:47:51Z" level=fatal msg="Error connecting to the API server after trying for one minute: Failed to create gRPC connection: context deadline exceeded"

This was caused by this commit that introduced new parameters to specify the API Server hostname/port. I don't think that blocks merging this PR, but we must ensure we have this change covered in DSPO repo.

cc @mprahl @hbelmiro

@hbelmiro
Copy link
Author

However, in my testing environment, the scheduled-workflow controller pod is always restarting with the following message:

time="2025-02-12T15:46:51Z" level=info msg="Connecting the API server over GRPC at: ml-pipeline:8887"
time="2025-02-12T15:47:51Z" level=fatal msg="Error connecting to the API server after trying for one minute: Failed to create gRPC connection: context deadline exceeded"

This was caused by this commit that introduced new parameters to specify the API Server hostname/port. I don't think that blocks merging this PR, but we must ensure we have this change covered in DSPO repo.

@rimolive you might have forgotten to use opendatahub-io/data-science-pipelines-operator#779.

@rimolive
Copy link

/lgtm

Thanks, @hbelmiro! Using the image build in opendatahub-io/data-science-pipelines-operator#779 fixed the ScheduledWorkflow controller issue.

Copy link

@mprahl mprahl left a comment

Choose a reason for hiding this comment

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

I did a git diff comparing your PR to the latest upstream master and it looked good to me.

Copy link

openshift-ci bot commented Feb 12, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mprahl

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 d347d3e into opendatahub-io:master Feb 12, 2025
60 checks passed
@hbelmiro hbelmiro deleted the rebase-2.4-master branch February 13, 2025 11:49
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.