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

fix: add workflow name info for pods created by cyclone #1506

Merged
merged 1 commit into from Sep 27, 2020

Conversation

zhujian7
Copy link
Collaborator

@zhujian7 zhujian7 commented Sep 25, 2020

What this PR does / why we need it:

Add workflow name info for pods created by cyclone

Which issue(s) this PR is related to (optional, link to 3rd issue(s)):

Fixes #

Reference to #

Special notes for your reviewer:

/cc @your-reviewer

Release note:

NONE

@caicloud-bot caicloud-bot added release-note-none Denotes a PR that doesn't merit a release note. caicloud-cla: yes Indicates the PR's author has not signed the Caicloud CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 25, 2020
@zhujian7 zhujian7 changed the title fix: add workflow name info for pods created by cyclone wip:fix: add workflow name info for pods created by cyclone Sep 25, 2020
@caicloud-bot caicloud-bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 25, 2020
@zhujian7 zhujian7 changed the title wip:fix: add workflow name info for pods created by cyclone fix: add workflow name info for pods created by cyclone Sep 25, 2020
@caicloud-bot caicloud-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 25, 2020
@zhujian7
Copy link
Collaborator Author

zhujian7 commented Sep 25, 2020

@jianglinjian @lichuan0620 @hyy0322 please review

@lichuan0620
Copy link

LGTM

@hyy0322
Copy link
Contributor

hyy0322 commented Sep 27, 2020

/lgtm

@caicloud-bot caicloud-bot added the lgtm Indicates that a PR is ready to be merged. label Sep 27, 2020
@hyy0322
Copy link
Contributor

hyy0322 commented Sep 27, 2020

I think it's a common ability. Will it merge other branch ?

@zhujian7
Copy link
Collaborator Author

/approve

@zhujian7
Copy link
Collaborator Author

/cherrypick master

@caicloud-bot
Copy link
Collaborator

@zhujian7: once the present PR merges, I will cherry-pick it on top of master in a new PR and assign it to you.

In response to this:

/cherrypick master

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@caicloud-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hyy0322, zhujian7

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

@caicloud-bot caicloud-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 27, 2020
@caicloud-bot caicloud-bot merged commit 50c9fd9 into caicloud:cps-2.10 Sep 27, 2020
@caicloud-bot
Copy link
Collaborator

@zhujian7: #1506 failed to apply on top of branch "master":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	pkg/workflow/common/const.go
M	pkg/workflow/workflowrun/operator.go
M	pkg/workflow/workload/pod/builder.go
M	pkg/workflow/workload/pod/builder_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/workflow/workload/pod/builder_test.go
Auto-merging pkg/workflow/workload/pod/builder.go
CONFLICT (content): Merge conflict in pkg/workflow/workload/pod/builder.go
Auto-merging pkg/workflow/workflowrun/operator.go
Auto-merging pkg/workflow/common/const.go
CONFLICT (content): Merge conflict in pkg/workflow/common/const.go
Patch failed at 0001 fix: add workflow nnd project name info for pods created by cyclone

In response to this:

/cherrypick master

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@zhujian7
Copy link
Collaborator Author

/cherrypick cps-2.10-dood

@caicloud-bot
Copy link
Collaborator

@zhujian7: new pull request could not be created: status code 422 not one of [201], body: {"message":"Validation Failed","errors":[{"resource":"PullRequest","code":"custom","message":"No commits between caicloud:cps-2.10-dood and caicloud-bot:cherry-pick-1506-to-cps-2.10-dood"}],"documentation_url":"https://docs.github.com/rest/reference/pulls#create-a-pull-request"}

In response to this:

/cherrypick cps-2.10-dood

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

caicloud-bot pushed a commit that referenced this pull request Nov 5, 2020
…1507)

* fix: add workflow nnd project name info for pods created by cyclone (#1506)

* fix: delete project name in workflow pod env

cherry-pick: #1509
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. caicloud-cla: yes Indicates the PR's author has not signed the Caicloud CLA. lgtm Indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants