[release-4.6] Bug 1899735: pkg/daemon: don't delete a file if its replaced with a dropin by openshift-cherrypick-robot · Pull Request #2246 · openshift/machine-config-operator

openshift-cherrypick-robot · 2020-11-19T21:15:47Z

This is an automated cherry-pick of #2196

/assign vrutkovs

Some systemd service settings may be defined in .Storage.Files and in .Systemd.Units.Dropins. Dropins is preferable, so users may want to migrate to the way. However if a file representing a dropin was defined in .Storage.Files and converted into .Systemd.Units.Dropin in new version of MC, it would be placed by Ignition's dropin implementation and then garbage-collected by MCD's deleteStaleData. This change ensures we're checking Systemd.Units.Dropins before attempting to remove this file. This is crucial for OKD 4.5 -> 4.6 upgrades - kubelet MCO config was defined as a file in 4.5 and converted into a dropin in 4.6

Make gosec happy as it complains about excessive nesting (nestingReduce)

This ensures isPathInDropins returns expected values

openshift-ci-robot · 2020-11-19T21:15:56Z

@openshift-cherrypick-robot: Bugzilla bug 1895360 has been cloned as Bugzilla bug 1899735. Retitling PR to link against new bug.
/retitle [release-4.6] Bug 1899735: pkg/daemon: don't delete a file if its replaced with a dropin

Details

In response to this:

[release-4.6] Bug 1895360: pkg/daemon: don't delete a file if its replaced with a dropin

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-robot · 2020-11-19T21:16:17Z

@openshift-cherrypick-robot: This pull request references Bugzilla bug 1899735, which is invalid:

expected dependent Bugzilla bug 1895360 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is MODIFIED instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

[release-4.6] Bug 1899735: pkg/daemon: don't delete a file if its replaced with a dropin

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.

vrutkovs · 2020-11-20T08:37:42Z

/retest

vrutkovs · 2020-11-21T16:20:02Z

/retest

vrutkovs · 2020-11-21T19:13:04Z

/retest

OKD flakes

vrutkovs · 2020-11-21T22:20:53Z

/retest

vrutkovs · 2020-11-23T12:49:37Z

/retest

vrutkovs · 2020-11-24T09:32:42Z

/test okd-e2e-gcp-op

LorbusChris · 2020-11-24T17:10:08Z

/retest

LorbusChris · 2020-11-24T18:20:58Z

I think OKD on GCP won't work until #2217 lands in release-4.6.
I'd suggest to hold this PR here until #2217 is backported so updates can be tested properly then.
/hold

vrutkovs · 2020-11-25T07:45:38Z

/hold cancel

OKD on GCP works after openshift/okd-machine-os#9 was merged. Its invalid tests which breaks us:

 === RUN   TestKernelType
--- FAIL: TestKernelType (1217.30s)
    mcd_test.go:179: Created kerneltype-6b7be424-c970-4e91-be74-4d27cdcde318
    utils_test.go:66: Pool infra has rendered config kerneltype-6b7be424-c970-4e91-be74-4d27cdcde318 with rendered-infra-d20c54c28c1a93dfb0e410adc1c51aa3 (waited 6.051398477s)
    mcd_test.go:183: pool infra didn't report rendered-infra-d20c54c28c1a93dfb0e410adc1c51aa3 to updated (waited 20m0.041028231s): timed out waiting for the condition

OKD doesn't support RT kernel, so this test needs to be skipped there. I think we need override here

vrutkovs · 2020-11-25T07:47:15Z

/bugzilla refresh

openshift-ci-robot · 2020-11-25T07:47:20Z

@vrutkovs: This pull request references Bugzilla bug 1899735, which is valid.

6 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.6.z) matches configured target release for branch (4.6.z)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
dependent bug Bugzilla bug 1895360 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
dependent Bugzilla bug 1895360 targets the "4.7.0" release, which is one of the valid target releases: 4.7.0
bug has dependents

Details

In response to this:

/bugzilla refresh

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.

runcom · 2020-11-25T08:51:55Z

/approve

runcom · 2020-11-25T08:53:01Z

@vrutkovs noted ok-e2e-gcp-op is broken for other reasons, let's override that as this is needed in OKD anyway

/override ci/prow/okd-e2e-gcp-op

openshift-ci-robot · 2020-11-25T08:53:26Z

@runcom: Overrode contexts on behalf of runcom: ci/prow/okd-e2e-gcp-op

Details

In response to this:

@vrutkovs noted ok-e2e-gcp-op is broken for other reasons, let's override that as this is needed in OKD anyway

/override ci/prow/okd-e2e-gcp-op

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.

LorbusChris · 2020-11-25T13:23:37Z

/lgtm

openshift-ci-robot · 2020-11-25T13:23:56Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: LorbusChris, openshift-cherrypick-robot, runcom

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:

~~OWNERS~~ [runcom]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

vrutkovs · 2020-11-26T11:51:14Z

/retest

vrutkovs · 2020-11-26T14:23:45Z

/retest

vrutkovs · 2020-11-26T18:00:59Z

/test e2e-aws

openshift-ci-robot · 2020-11-26T21:46:11Z

@openshift-cherrypick-robot: All pull requests linked via external trackers have merged:

openshift/machine-config-operator#2246

Bugzilla bug 1899735 has been moved to the MODIFIED state.

Details

In response to this:

[release-4.6] Bug 1899735: pkg/daemon: don't delete a file if its replaced with a dropin

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.

Vadim Rutkovsky added 3 commits November 19, 2020 21:15

deleteStaleData: rework files looping

59b0d82

Make gosec happy as it complains about excessive nesting (nestingReduce)

pkg/daemon: add unit test for isPathInDropins

ed25178

This ensures isPathInDropins returns expected values

openshift-ci-robot assigned vrutkovs Nov 19, 2020

openshift-cherrypick-robot mentioned this pull request Nov 19, 2020

Bug 1895360: pkg/daemon: don't delete a file if its replaced with a dropin #2196

Merged

openshift-ci-robot changed the title ~~[release-4.6] Bug 1895360: pkg/daemon: don't delete a file if its replaced with a dropin~~ [release-4.6] Bug 1899735: pkg/daemon: don't delete a file if its replaced with a dropin Nov 19, 2020

openshift-ci-robot added the bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. label Nov 19, 2020

openshift-ci-robot added the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Nov 19, 2020

openshift-ci-robot requested review from cgwalters and yuqi-zhang November 19, 2020 21:16

kikisdeliveryservice added the 4.6 Work targeted for 4.6 label Nov 19, 2020

vrutkovs mentioned this pull request Nov 20, 2020

[Tracking] OKD 4.6 Stable okd-project/okd#348

Closed

6 tasks

openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 24, 2020

openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 25, 2020

openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Nov 25, 2020

openshift-ci-robot removed the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Nov 25, 2020

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 25, 2020

openshift-ci-robot assigned LorbusChris Nov 25, 2020

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 25, 2020

mfojtik added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Nov 26, 2020

openshift-merge-robot merged commit f271120 into openshift:release-4.6 Nov 26, 2020

Conversation

openshift-cherrypick-robot commented Nov 19, 2020

Uh oh!

openshift-ci-robot commented Nov 19, 2020

Uh oh!

openshift-ci-robot commented Nov 19, 2020

Uh oh!

vrutkovs commented Nov 20, 2020

Uh oh!

vrutkovs commented Nov 21, 2020

Uh oh!

vrutkovs commented Nov 21, 2020

Uh oh!

vrutkovs commented Nov 21, 2020

Uh oh!

vrutkovs commented Nov 23, 2020

Uh oh!

vrutkovs commented Nov 24, 2020

Uh oh!

LorbusChris commented Nov 24, 2020

Uh oh!

LorbusChris commented Nov 24, 2020

Uh oh!

vrutkovs commented Nov 25, 2020

Uh oh!

vrutkovs commented Nov 25, 2020

Uh oh!

openshift-ci-robot commented Nov 25, 2020

Uh oh!

runcom commented Nov 25, 2020

Uh oh!

runcom commented Nov 25, 2020

Uh oh!

openshift-ci-robot commented Nov 25, 2020

Uh oh!

LorbusChris commented Nov 25, 2020

Uh oh!

openshift-ci-robot commented Nov 25, 2020

Uh oh!

vrutkovs commented Nov 26, 2020

Uh oh!

vrutkovs commented Nov 26, 2020

Uh oh!

vrutkovs commented Nov 26, 2020

Uh oh!

openshift-ci-robot commented Nov 26, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants