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

Add script to facilitate cherry-picking from k/k #253

Merged
merged 1 commit into from Aug 25, 2021

Conversation

nckturner
Copy link
Contributor

Until legacy-cloud-provider is deleted, there is a possibility that
bug fixes are merged into k/k before this respository. This script
makes it easier to cherry-pick commits from there to here, which
requires a path rewrite and is a pain to do by hand. This will
probably stop being useful if the v1 provider in this repository
diverges from the legacy provider in k/k, and we should encourage
contributions to come here first.

What type of PR is this?

/kind cleanup

What this PR does / why we need it:
Quick script to facilitate cherry picking and path rewriting from k/k

NONE

* Until legacy-cloud-provider is deleted, there is a possibility that
  bug fixes are merged into k/k before this respository. This script
  makes it easier to cherry-pick commits from there to here, which
  requires a path rewrite and is a pain to do by hand.  This will
  probably stop being useful if the v1 provider in this repository
  diverges from the legacy provider in k/k, and we should encourage
  contributions to come here first.
@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Aug 25, 2021
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Aug 25, 2021
@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 25, 2021
popd > /dev/null

echo "Modifying paths in patch..."
sed -i "s|staging/src/k8s.io/legacy-cloud-providers/aws|pkg/providers/v1|g" "${patch_file}"
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
Contributor Author

Choose a reason for hiding this comment

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

Ah, I tried --directory first which obviously didn't work due to the leading path, I'll have to give it a try with -p as well.

@wongma7
Copy link
Contributor

wongma7 commented Aug 25, 2021

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 25, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nckturner, wongma7

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

@k8s-ci-robot k8s-ci-robot merged commit 19e1d0a into kubernetes:master Aug 25, 2021
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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants