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(frontend): Upgrade argo template on UI. Fix #5358 #5359

Merged
merged 5 commits into from
Mar 29, 2021

Conversation

zijianjoy
Copy link
Collaborator

@zijianjoy zijianjoy commented Mar 22, 2021

Description of your changes:

Applied the change from Argo model to KFP UI third_party dependency. It is because we have upgraded to newer version of Argo and need to accommodate potential breaking changes.

There are a couple fields getting removed from Argo but not from KFP in this PR. Because it will need changes on production code, however, I am not sure whether changing it is desired.

  1. S3Artifact:
    https://github.com/zijianjoy/pipelines/blob/cf192ba4cf8c66a020ff64ee6cb6804238e0bd2d/frontend/third_party/argo-ui/argo_template.ts#L54

It is being referenced in https://github.com/zijianjoy/pipelines/blob/master/frontend/src/lib/StatusUtils.ts#L113-L115, but I am not sure if it is okay to remove.

  1. metadata
    https://github.com/zijianjoy/pipelines/blob/master/frontend/third_party/argo-ui/argo_template.ts#L557

It seems to be important field which is needed in Parser: https://github.com/zijianjoy/pipelines/blob/master/frontend/src/lib/StaticGraphParser.ts#L182
https://github.com/zijianjoy/pipelines/blob/master/frontend/src/lib/ParserUtils.ts#L39

Checklist:

/**
* Raw contains raw artifact location details
*/
raw?: RawArtifact;
Copy link
Contributor

Choose a reason for hiding this comment

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

Are you sure we want to remove this? The KFPv1 compiler uses raw artifacts.

Copy link
Contributor

Choose a reason for hiding this comment

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

Argo removed it, which is strange...

Looks like at least KFP UI is not using it.

Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Although Argo workflow proto has it, I am not sure how it is being used on UI. It might be that this is being used on the SDK side but not on UI, so Argo UI has removed it from Artifact interface: https://github.com/argoproj/argo-workflows/blob/a8e9348261c77cb3b13bef864520128279f2e6b8/ui/src/models/workflows.ts#L28

However, I tend to be conservative before further confirmation. So I will keep the rawArtifact here for now.

@Bobgy
Copy link
Contributor

Bobgy commented Mar 23, 2021

For confirmation, which version of argo did you upgrade to? I'd suggest using v2.12.X (latest)

Copy link
Collaborator Author

@zijianjoy zijianjoy left a comment

Choose a reason for hiding this comment

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

For confirmation, which version of argo did you upgrade to? I'd suggest using v2.12.X (latest)

That is a very good point! Thank you Yuan! Now I use the correct version v2.12.0 from Argo: https://github.com/argoproj/argo-workflows/blob/a8e9348261c77cb3b13bef864520128279f2e6b8/ui/src/models/workflows.ts#L28

frontend/src/lib/StaticGraphParser.ts Outdated Show resolved Hide resolved
/**
* Raw contains raw artifact location details
*/
raw?: RawArtifact;
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Although Argo workflow proto has it, I am not sure how it is being used on UI. It might be that this is being used on the SDK side but not on UI, so Argo UI has removed it from Artifact interface: https://github.com/argoproj/argo-workflows/blob/a8e9348261c77cb3b13bef864520128279f2e6b8/ui/src/models/workflows.ts#L28

However, I tend to be conservative before further confirmation. So I will keep the rawArtifact here for now.

@zijianjoy zijianjoy requested review from Bobgy and Ark-kun March 25, 2021 18:28
@Bobgy
Copy link
Contributor

Bobgy commented Mar 26, 2021

@zijianjoy Is it a typo? Latest argo is 2.12.10

@Bobgy
Copy link
Contributor

Bobgy commented Mar 26, 2021

/approve
/LGTM

/Hold
You can confirm above question and unhold

@zijianjoy
Copy link
Collaborator Author

@zijianjoy Is it a typo? Latest argo is 2.12.10

That is a good catch! Confirming the version we need to copy from by starting over the following steps:

  1. Confirm that we upgraded to which Argo version: v2.12.9: feat: update argo image to v2.12.9 and automate update process. Fixes #5232 #5266
  2. Look for the release branch on Argo with v2.12: https://github.com/argoproj/argo-workflows/commits/release-2.12
  3. Click the commit Update manifests to v2.12.9 and click browse files.
  4. This is the argo file with v2.12.9: https://github.com/argoproj/argo-workflows/blob/737905345d70ba1ebd566ce1230e4f971993dfd0/ui/src/models/workflows.ts

I have made adjustment for matching this file.

@Bobgy
Copy link
Contributor

Bobgy commented Mar 29, 2021

Note, another way to find the commit is by looking at commit tags, there will be a tag for each version. They are the canonical source of truth for versions

@Bobgy
Copy link
Contributor

Bobgy commented Mar 29, 2021

/lgtm
/approve

Thank you for the upgrade!

@google-oss-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Bobgy

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

@zijianjoy
Copy link
Collaborator Author

/lgtm
/approve

Thank you for the upgrade!

Thank you Yuan! Yes I confirm the tag v2.12.9 and its commit as shown in https://github.com/argoproj/argo-workflows/releases/tag/v2.12.9 too.

@zijianjoy
Copy link
Collaborator Author

/unhold

@google-oss-robot google-oss-robot merged commit a9f8eec into kubeflow:master Mar 29, 2021
@Bobgy Bobgy deleted the argoui-parse branch March 29, 2021 15:24
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.

[frontend] Upgrade Argo UI template to match original content
4 participants