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.

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

Bug 1841581: Ensure resolv.conf is in place in prepender before running podman #1765

Merged
merged 1 commit into from May 29, 2020

Conversation

stbenjam
Copy link
Member

Since we now have set -e, when podman fails the whole script fails,
and we end up with no resolv.conf at all. Previously, the podman failed
but we fellthrough to where we copy the file to /etc/resolv.conf, and on
the second run it succeeds.


# Ensure resolv.conf exists before we try to run podman
cp /var/run/NetworkManager/resolv.conf /etc/resolv.conf

Copy link
Contributor

Choose a reason for hiding this comment

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

It's probably safer to do this in the case I think, so it only copies on a valid $STATUS?

We can then also remove the else "Couldn't find a Virtual IP" part

Copy link
Member Author

Choose a reason for hiding this comment

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

Ah yea good call

@stbenjam stbenjam changed the title Ensure resolv.conf is in place in prepender before running podman Bug 1841581: Ensure resolv.conf is in place in prepender before running podman May 29, 2020
@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-unspecified Referenced Bugzilla bug's severity is unspecified for the PR. label May 29, 2020
@openshift-ci-robot
Copy link
Contributor

@stbenjam: This pull request references Bugzilla bug 1841581, 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.5.0) matches configured target release for branch (4.5.0)
  • bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1841581: Ensure resolv.conf is in place in prepender before running podman

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 the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label May 29, 2020
@stbenjam
Copy link
Member Author

/bugzilla refresh

@openshift-ci-robot openshift-ci-robot added bugzilla/severity-urgent Referenced Bugzilla bug's severity is urgent for the branch this PR is targeting. and removed bugzilla/severity-unspecified Referenced Bugzilla bug's severity is unspecified for the PR. labels May 29, 2020
@openshift-ci-robot
Copy link
Contributor

@stbenjam: This pull request references Bugzilla bug 1841581, which is valid.

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

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.

Since we now have `set -e`, when podman fails the whole script fails,
and we end up with no resolv.conf at all. Previously, the podman failed
but we fellthrough to where we copy the file to /etc/resolv.conf, and on
the second run it succeeds.
@celebdor
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label May 29, 2020
@cgwalters
Copy link
Member

/lgtm

@cgwalters
Copy link
Member

/approve

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: celebdor, cgwalters, stbenjam

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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 29, 2020
@hardys
Copy link
Contributor

hardys commented May 29, 2020

lgtm, thanks!

@openshift-ci-robot
Copy link
Contributor

@stbenjam: The following test failed, say /retest to rerun all failed tests:

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

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.

@openshift-bot
Copy link
Contributor

/retest

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

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

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

@openshift-merge-robot openshift-merge-robot merged commit 293f78b into openshift:master May 29, 2020
@openshift-ci-robot
Copy link
Contributor

@stbenjam: All pull requests linked via external trackers have merged: openshift/machine-config-operator#1765. Bugzilla bug 1841581 has been moved to the MODIFIED state.

In response to this:

Bug 1841581: Ensure resolv.conf is in place in prepender before running podman

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.

@stbenjam stbenjam deleted the fix-resolv.conf branch May 29, 2020 16:35
mandre added a commit to mandre/machine-config-operator that referenced this pull request Jun 29, 2020
This aligned OpenStack and vSphere platforms with with the BM one after
openshift#1763 and openshift#1765.
mandre added a commit to mandre/machine-config-operator that referenced this pull request Jul 2, 2020
This aligned OpenStack and vSphere platforms with with the BM one after
openshift#1763 and openshift#1765.
mandre added a commit to mandre/machine-config-operator that referenced this pull request Aug 19, 2020
Manual backport of
openshift#1773 to
release-4.5 because of merge conflict. We can't share the prepender
script between control plane and compute nodes in OpenStack due to
dependency on the DNS VIP.

This basically boils down to porting
openshift#1765 to the
openstack worker prepender script that was forgotten in the initial
commit.

VShpere counterpart doesn't run podman and hence doesn't need the patch.
vrutkovs pushed a commit to vrutkovs/machine-config-operator that referenced this pull request Aug 29, 2020
Manual backport of
openshift#1773 to
release-4.5 because of merge conflict. We can't share the prepender
script between control plane and compute nodes in OpenStack due to
dependency on the DNS VIP.

This basically boils down to porting
openshift#1765 to the
openstack worker prepender script that was forgotten in the initial
commit.

VShpere counterpart doesn't run podman and hence doesn't need the patch.
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-urgent Referenced Bugzilla bug's severity is urgent 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.

None yet

7 participants