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

Change merge key for VolumeMount to mountPath #35071

Merged
merged 1 commit into from
Oct 19, 2016
Merged

Change merge key for VolumeMount to mountPath #35071

merged 1 commit into from
Oct 19, 2016

Conversation

thockin
Copy link
Member

@thockin thockin commented Oct 18, 2016 •
edited by jessfraz
Loading

Fixes #34800

Change merge key for VolumeMount to mountPath

This change is Reviewable

@thockin thockin added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Oct 18, 2016
@k8s-github-robot k8s-github-robot added kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Oct 18, 2016
@mengqiy
Copy link
Member

mengqiy commented Oct 19, 2016 •
edited
Loading

@k8s-bot gci gke e2e test this

@mengqiy
Copy link
Member

mengqiy commented Oct 19, 2016

/lgtm

@k8s-github-robot k8s-github-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 19, 2016
@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-ci-robot
Copy link
Contributor

Jenkins GCI GKE smoke e2e failed for commit 837443d. Full PR test history.

The magic incantation to run this job again is @k8s-bot gci gke e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 3fc8cff into kubernetes:master Oct 19, 2016
@mengqiy mengqiy mentioned this pull request Oct 19, 2016
Closed
@thockin thockin mentioned this pull request Oct 20, 2016
Merged
@jessfraz jessfraz added cherrypick-candidate cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. labels Oct 20, 2016
@jessfraz jessfraz added this to the v1.4 milestone Oct 20, 2016
k8s-github-robot pushed a commit that referenced this pull request Oct 20, 2016
Merge pull request #35208 from thockin/automated-cherry-pick-of-#3507…
9046fb6 
…1-upstream-release-1.4

Automatic merge from submit-queue

Automated cherry pick of #35071 upstream release 1.4: Change merge key for VolumeMount to mountPath

Automated cherry pick of #35071 upstream release 1.4: Change merge key for VolumeMount to mountPath
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.4" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

@adambom
Copy link

adambom commented Oct 24, 2016 •
edited
Loading

This is a breaking change. Any reason you'd include this in a patch version update (1.4.3 -> 1.4.4)?

Never mind, I misinterpreted

@thockin thockin deleted the volume-mount-merge-key branch November 2, 2016 06:36
@mengqiy mengqiy mentioned this pull request Nov 17, 2016
Closed
shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
Merge pull request kubernetes#35208 from thockin/automated-cherry-pic…
ac06b2f 
…k-of-#35071-upstream-release-1.4

Automatic merge from submit-queue

Automated cherry pick of kubernetes#35071 upstream release 1.4: Change merge key for VolumeMount to mountPath

Automated cherry pick of kubernetes#35071 upstream release 1.4: Change merge key for VolumeMount to mountPath
@pwittrock
Copy link
Member

pwittrock commented Dec 2, 2016 •
edited by thockin
Loading

Link to 1.5 Issue Accumulator #37134

Summary:

The strategicmerge patchMergeKey for VolumeMounts was changed from "name" to "mountPath".  This is because the name field  is the name of the Volume, not the unique key of the VolumeMount.  Multiple VolumeMounts will have the same Volume name if mounting the same volume more than once.  The "mountPath" is verified to be unique and can act as the mergekey.

@vdice vdice mentioned this pull request Jan 5, 2017
Closed
@tmszdmsk tmszdmsk mentioned this pull request Jun 2, 2020
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@mengqiy mengqiy

Labels
cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
v1.4
Development

Successfully merging this pull request may close these issues.
9 participants
@thockin @mengqiy @k8s-github-robot @k8s-ci-robot @k8s-cherrypick-bot @adambom @pwittrock @jessfraz @googlebot