Skip to content

Conversation

@wking
Copy link
Member

@wking wking commented Dec 3, 2021

We had been merging by name since ensureVolumeMounts landed in 83faa6e (#654). But as pointed out in rhbz#2026560, a single volume may be mounted at multiple paths. With this commit, I'm pivoting to merge by mountPath, which is the patchMergeKey (and it makes sense that you wouldn't have multiple volumes mounted at the same path).

We had been merging by name since ensureVolumeMounts landed in
83faa6e (lib/resourcemerge/core: Remove unrecognized volumes and
mounts, 2021-09-14, openshift#654).  But as pointed out in [1], a single volume
may be mounted at multiple paths.  With this commit, I'm pivoting to
merge by mountPath, which is the patchMergeKey [2] (and it makes sense
that you wouldn't have multiple volumes mounted at the same path).

[1]: https://bugzilla.redhat.com/show_bug.cgi?id=2026560
[2]: https://github.com/kubernetes/api/blob/1d6faf224f146dd002553f55cd9fcaaaa0dc00cb/core/v1/types.go#L2367
@openshift-ci openshift-ci bot added bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Dec 3, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 3, 2021

@wking: This pull request references Bugzilla bug 2026560, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.10.0) matches configured target release for branch (4.10.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @jianlinliu

Details

In response to this:

Bug 2026560: lib/resourcemerge/core: Merge volumeMounts by mountPath

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.

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 3, 2021
Copy link

@vrutkovs vrutkovs left a comment

Choose a reason for hiding this comment

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

/lgtm

@vrutkovs
Copy link

vrutkovs commented Dec 3, 2021

/retest

Holding off cherry-picks until 4.11 branches

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 3, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vrutkovs, wking

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 3, 2021
@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

3 similar comments
@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@vrutkovs
Copy link

vrutkovs commented Dec 3, 2021

alert etcdHighNumberOfLeaderChanges fired for 60 seconds with labels: {endpoint="etcd-metrics", job="etcd", namespace="openshift-etcd", pod="etcd-ci-op-pzgxrixd-7ee27-bf992-master-2", service="etcd", severity="warning"}

not related to this PR
/override ci/prow/e2e-agnostic-upgrade

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 3, 2021

@vrutkovs: Overrode contexts on behalf of vrutkovs: ci/prow/e2e-agnostic-upgrade

Details

In response to this:

alert etcdHighNumberOfLeaderChanges fired for 60 seconds with labels: {endpoint="etcd-metrics", job="etcd", namespace="openshift-etcd", pod="etcd-ci-op-pzgxrixd-7ee27-bf992-master-2", service="etcd", severity="warning"}

not related to this PR
/override ci/prow/e2e-agnostic-upgrade

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.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit a14f4e2 into openshift:master Dec 3, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 3, 2021

@wking: All pull requests linked via external trackers have merged:

Bugzilla bug 2026560 has been moved to the MODIFIED state.

Details

In response to this:

Bug 2026560: lib/resourcemerge/core: Merge volumeMounts by mountPath

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.

@wking wking deleted the key-volumeMounts-by-mountPath branch December 3, 2021 21:13
@wking
Copy link
Member Author

wking commented Dec 14, 2021

/cherrypick release-4.9

@openshift-cherrypick-robot

@wking: new pull request created: #715

Details

In response to this:

/cherrypick release-4.9

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.

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. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants