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.

Sign up for GitHub

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

Jump to bottom

Automated cherry pick of #71923: diff: Fix overlapping filenames #71955

Merged
merged 2 commits into from
Dec 12, 2018
Merged

Automated cherry pick of #71923: diff: Fix overlapping filenames #71955

merged 2 commits into from
Dec 12, 2018

Conversation

apelisse
Copy link
Member

@apelisse apelisse commented Dec 11, 2018 •
edited by aleksandra-malinowska

Cherry pick of #71923 and #71974 on release-1.13.

#71923: diff: Fix overlapping filenames
#71974

Fix overlapping filenames in diff if multiple resources have the same name.

@k8s-ci-robot k8s-ci-robot added do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Dec 11, 2018
@apelisse
Copy link
Member Author

/sig cli
/priority critical-urgent
/kind bug

@k8s-ci-robot k8s-ci-robot added sig/cli Categorizes an issue or PR as relevant to SIG CLI. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. kind/bug Categorizes issue or PR as related to a bug. area/kubectl sig/testing Categorizes an issue or PR as relevant to SIG Testing. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Dec 11, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: apelisse

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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 11, 2018
@mengqiy
Copy link
Member

mengqiy commented Dec 11, 2018

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 11, 2018
@aleksandra-malinowska aleksandra-malinowska added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels Dec 11, 2018
@apelisse
Copy link
Member Author

/retest

@liggitt
Copy link
Member

liggitt commented Dec 11, 2018

/hold

We should use a file name that is safe cross-platform

See
https://github.com/kubernetes/kubernetes/pull/71923/files#r240830625

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 11, 2018
Antoine Pelisse added 2 commits December 11, 2018 15:51
diff: Fix overlapping filenames
934a62b 
The filename can overlap when multiple resources have the same name (but
obviously are of a different type). Include the name of the type in the
file name to prevent the overlap.
diff: Make filename cross-platform compatible
4980403
@apelisse apelisse force-pushed the automated-cherry-pick-of-#71923-upstream-release-1.13 branch from 9c8279b to 4980403 Compare December 11, 2018 23:53
@k8s-ci-robot k8s-ci-robot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. labels Dec 11, 2018
@apelisse apelisse added the release-note-none Denotes a PR that doesn't merit a release note. label Dec 11, 2018
@apelisse
Copy link
Member Author

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 11, 2018
@liggitt
Copy link
Member

liggitt commented Dec 11, 2018

/lgtm

thanks

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 11, 2018
@tpepper
Copy link
Member

tpepper commented Dec 12, 2018

/retest

@tpepper
Copy link
Member

tpepper commented Dec 12, 2018

@apelisse the bot's not picking up release notes apparently when there are multiple PR's commites being cherry picked. Can you add a release note to this PR's description text?

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Dec 12, 2018
@k8s-ci-robot k8s-ci-robot merged commit eec55b9 into kubernetes:release-1.13 Dec 12, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dims dims Awaiting requested review from dims

@mengqiy mengqiy Awaiting requested review from mengqiy

Assignees

@liggitt liggitt

@mengqiy mengqiy

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubectl cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/cli Categorizes an issue or PR as relevant to SIG CLI. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@apelisse @k8s-ci-robot @mengqiy @liggitt @tpepper @aleksandra-malinowska