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

Bug 1775647: pkg/daemon: randomize pivot container name #1285

Merged
merged 1 commit into from Dec 4, 2019
Merged

Bug 1775647: pkg/daemon: randomize pivot container name #1285

merged 1 commit into from Dec 4, 2019
+11 −10

Conversation

runcom
Copy link
Member

@runcom runcom commented Nov 22, 2019 •
edited

If podman has a bug and cannot cleanup container names, we'll be stuck
in the update process as seen in
https://bugzilla.redhat.com/show_bug.cgi?id=1775647.
Randomize container names with UUID to avoid that and I think it's
generally better to do this w/o cleaning up at the beginning every time.

The linked bug won't be closed by this, just using it to attach to it so we can merge as part of that. The podman fix, if any, will close it.

Signed-off-by: Antonio Murdaca runcom@linux.com

@openshift-ci-robot
Copy link
Contributor

@runcom: This pull request references Bugzilla bug 1775647, which is invalid:

  • expected the bug to target the "4.3.0" release, but it targets "4.2.z" 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.

In response to this:

Bug 1775647: pkg/daemon: randomize pivot container name

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 openshift-ci-robot added bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Nov 22, 2019
@runcom
Copy link
Member Author

runcom commented Nov 22, 2019

/bugzilla refresh

@openshift-ci-robot 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 22, 2019
@openshift-ci-robot
Copy link
Contributor

@runcom: This pull request references Bugzilla bug 1775647, 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.

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.

@openshift-ci-robot 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 22, 2019
@openshift-ci-robot
Copy link
Contributor

@runcom: This pull request references Bugzilla bug 1775647, which is valid.

In response to this:

Bug 1775647: pkg/daemon: randomize pivot container name

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.

cgwalters
cgwalters reviewed Nov 22, 2019
View reviewed changes
pkg/daemon/rpm-ostree.go Outdated Show resolved Hide resolved
@runcom
pkg/daemon: randomize pivot container name
c2f5c8f 
If podman has a bug and cannot cleanup container names, we'll be stuck
in the update process as seen in
https://bugzilla.redhat.com/show_bug.cgi?id=1775647.
Randomize container names with UUID to avoid that and I think it's
generally better to do this w/o cleaning up at the beginning every time.

Signed-off-by: Antonio Murdaca <runcom@linux.com>
ashcrow
ashcrow approved these changes Nov 22, 2019
View reviewed changes
Copy link
Member

@ashcrow ashcrow left a comment

Choose a reason for hiding this comment

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

Looks good to me

@runcom
Copy link
Member Author

runcom commented Nov 22, 2019

/skip

@ashcrow
Copy link
Member

ashcrow commented Nov 22, 2019

Will defer to @kikisdeliveryservice for LGTM

@kikisdeliveryservice
Copy link
Contributor

/skip

@kikisdeliveryservice
Copy link
Contributor

this LGTM but letting colin do final review/ check to see if any objections

/assign @cgwalters

@cgwalters
Copy link
Member

/lgtm
(In the future I want to move this code natively into rpm-ostree FWIW and when we do so we should likely entirely avoid the default podman storage and use e.g. /run/rpm-ostree/containers-storage or something like that so that we can't hit incompatibilities like this)

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 2, 2019
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ashcrow, cgwalters, runcom

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:
  • OWNERS [ashcrow,cgwalters,runcom]

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

@openshift-bot
Copy link
Contributor

/retest

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

5 similar comments
@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@kikisdeliveryservice
Copy link
Contributor

/skip

@openshift-bot
Copy link
Contributor

/retest

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

5 similar comments
@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@kikisdeliveryservice
Copy link
Contributor

/test e2e-gcp-op

@kikisdeliveryservice
Copy link
Contributor

/test e2e-aws

@kikisdeliveryservice
Copy link
Contributor

unrelated failures bc of course..

/test e2e-gcp-op

@kikisdeliveryservice
Copy link
Contributor

/test e2e-aws

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Dec 3, 2019 •
edited

@runcom: The following tests failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/prow/e2e-aws-scaleup-rhel7 c2f5c8f link /test e2e-aws-scaleup-rhel7
ci/prow/e2e-vsphere c2f5c8f link /test e2e-vsphere

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

@kikisdeliveryservice
Copy link
Contributor

vpc/subnet issues

/test e2e-aws

@openshift-merge-robot openshift-merge-robot merged commit fcf88e1 into openshift:master Dec 4, 2019
@openshift-ci-robot
Copy link
Contributor

@runcom: All pull requests linked via external trackers have merged. Bugzilla bug 1775647 has been moved to the MODIFIED state.

In response to this:

Bug 1775647: pkg/daemon: randomize pivot container name

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.

@kikisdeliveryservice
Copy link
Contributor

/cherry-pick release-4.2

@openshift-cherrypick-robot
Copy link

@kikisdeliveryservice: new pull request created: #1347

In response to this:

/cherry-pick release-4.2

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-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Dec 18, 2019
Merged
@jlebon
Copy link
Member

jlebon commented Dec 18, 2019

@kikisdeliveryservice I think we need this backported to 4.1 and 4.3 also, right?

/cherry-pick release-4.1
/cherry-pick release-4.3

@openshift-cherrypick-robot
Copy link

@jlebon: #1285 failed to apply on top of branch "release-4.1":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
A	pkg/daemon/pivot/types/imageinspection.go
M	pkg/daemon/rpm-ostree.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/daemon/rpm-ostree.go
CONFLICT (content): Merge conflict in pkg/daemon/rpm-ostree.go
CONFLICT (modify/delete): pkg/daemon/pivot/types/imageinspection.go deleted in HEAD and modified in pkg/daemon: randomize pivot container name. Version pkg/daemon: randomize pivot container name of pkg/daemon/pivot/types/imageinspection.go left in tree.
Patch failed at 0001 pkg/daemon: randomize pivot container name

In response to this:

@kikisdeliveryservice I think we need this backported to 4.1 and 4.3 also, right?

/cherry-pick release-4.1
/cherry-pick release-4.3

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.

@jlebon
Copy link
Member

jlebon commented Dec 18, 2019

@jlebon: #1285 failed to apply on top of branch "release-4.1"

OK, will look into backporting this one manually. Let's try 4.3 again:

/cherry-pick release-4.3

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Dec 18, 2019
Merged
@openshift-cherrypick-robot
Copy link

@jlebon: new pull request created: #1348

In response to this:

@jlebon: #1285 failed to apply on top of branch "release-4.1"

OK, will look into backporting this one manually. Let's try 4.3 again:

/cherry-pick release-4.3

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.

jlebon added a commit to jlebon/pivot that referenced this pull request Dec 18, 2019
@jlebon
cmd/root: randomize pivot container name
4f61f3b 
This is a backport of
openshift/machine-config-operator#1285, which
for the 4.1 release should live here since we were still using the
separate pivot package.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1783621

Original cherry-picked commit message:

If podman has a bug and cannot cleanup container names, we'll be stuck
in the update process as seen in
https://bugzilla.redhat.com/show_bug.cgi?id=1775647.
Randomize container names with UUID to avoid that and I think it's
generally better to do this w/o cleaning up at the beginning every time.

Signed-off-by: Antonio Murdaca <runcom@linux.com>
@jlebon jlebon mentioned this pull request Dec 18, 2019
Merged
@jlebon
Copy link
Member

jlebon commented Dec 18, 2019

OK, will look into backporting this one manually.

OK, so for 4.1 we were still using the separate pivot binary.... Which, ahh yup, has a release-4.1 branch. Anyway, I backported it there: openshift/pivot#58. But I'm concerned by the fact that that repo is not hooked into the CI system at all. I guess we can rely on the RHCOS promotion CI coverage. (The alternative I think is backporting #882 to 4.1 which although has been used for a while now, is much more new code than strictly necessary to fix this in 4.1).

jlebon added a commit to jlebon/pivot that referenced this pull request Dec 18, 2019
@jlebon
cmd/root: randomize pivot container name
5e8a36b 
This is a backport of
openshift/machine-config-operator#1285, which
for the 4.1 release should live here since we were still using the
separate pivot package.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1783621

Original cherry-picked commit message:

If podman has a bug and cannot cleanup container names, we'll be stuck
in the update process as seen in
https://bugzilla.redhat.com/show_bug.cgi?id=1775647.
Randomize container names with UUID to avoid that and I think it's
generally better to do this w/o cleaning up at the beginning every time.

Signed-off-by: Antonio Murdaca <runcom@linux.com>
jlebon added a commit to jlebon/pivot that referenced this pull request Dec 18, 2019
@jlebon
cmd/root: randomize pivot container name
883c9e2 
This is a backport of
openshift/machine-config-operator#1285, which
for the 4.1 release should live here since we were still using the
separate pivot package.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1783621

Original cherry-picked commit message:

If podman has a bug and cannot cleanup container names, we'll be stuck
in the update process as seen in
https://bugzilla.redhat.com/show_bug.cgi?id=1775647.
Randomize container names with UUID to avoid that and I think it's
generally better to do this w/o cleaning up at the beginning every time.

Signed-off-by: Antonio Murdaca <runcom@linux.com>
jlebon added a commit to openshift/pivot that referenced this pull request Dec 18, 2019
@jlebon
cmd/root: randomize pivot container name
e31a72d 
This is a backport of
openshift/machine-config-operator#1285, which
for the 4.1 release should live here since we were still using the
separate pivot package.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1783621

Original cherry-picked commit message:

If podman has a bug and cannot cleanup container names, we'll be stuck
in the update process as seen in
https://bugzilla.redhat.com/show_bug.cgi?id=1775647.
Randomize container names with UUID to avoid that and I think it's
generally better to do this w/o cleaning up at the beginning every time.

Signed-off-by: Antonio Murdaca <runcom@linux.com>
@jlebon jlebon mentioned this pull request Dec 18, 2019
Merged
ashcrow pushed a commit to openshift/pivot that referenced this pull request Dec 18, 2019
@jlebon @ashcrow
cmd/root: randomize pivot container name
5abe8d3 
This is a backport of
openshift/machine-config-operator#1285, which
for the 4.1 release should live here since we were still using the
separate pivot package.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1783621

Original cherry-picked commit message:

If podman has a bug and cannot cleanup container names, we'll be stuck
in the update process as seen in
https://bugzilla.redhat.com/show_bug.cgi?id=1775647.
Randomize container names with UUID to avoid that and I think it's
generally better to do this w/o cleaning up at the beginning every time.

Signed-off-by: Antonio Murdaca <runcom@linux.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cgwalters cgwalters cgwalters left review comments

@ashcrow ashcrow ashcrow approved these changes

@kikisdeliveryservice kikisdeliveryservice Awaiting requested review from kikisdeliveryservice

Assignees

@cgwalters cgwalters

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@runcom @openshift-ci-robot @ashcrow @kikisdeliveryservice @cgwalters @openshift-bot @openshift-cherrypick-robot @jlebon @openshift-merge-robot