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

[release-4.6] Fix invalid symlink on second boot #12

Merged
merged 3 commits into from
Nov 21, 2020
Merged

[release-4.6] Fix invalid symlink on second boot #12

merged 3 commits into from
Nov 21, 2020

Conversation

vrutkovs
Copy link
Member

@vrutkovs vrutkovs commented Nov 20, 2020 •
edited
Loading

This PR includes:

  • Layer root/* files on host #8 - This replaces echo -n way to create files on host
  • Remove additional refs (FCOS version tag) which confuses bootstrap (it expects a single ref)
  • Avoid creating /etc/resolv.conf symlink to systemd-resolved managed file

Related to okd-project/okd#380

@openshift-ci-robot
Copy link

@vrutkovs: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

WIP [release-4.6] Fix invalid symlink on second boot

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 do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 20, 2020
@openshift-ci-robot
Copy link

@vrutkovs: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

WIP [release-4.6] Fix invalid symlink on second boot

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
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vrutkovs

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 Nov 20, 2020
@vrutkovs vrutkovs force-pushed the run-systemd-resolved branch 15 times, most recently from e32851b to 23c148c Compare November 21, 2020 09:24
@openshift-ci-robot
Copy link

@vrutkovs: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

WIP [release-4.6] Fix invalid symlink on second boot

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 vrutkovs force-pushed the run-systemd-resolved branch from 23c148c to 856c28e Compare November 21, 2020 10:23
@vrutkovs vrutkovs changed the title WIP [release-4.6] Fix invalid symlink on second boot [release-4.6] Fix invalid symlink on second boot Nov 21, 2020
@openshift-ci-robot
Copy link

@vrutkovs: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

[release-4.6] Fix invalid symlink on second boot

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 do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 21, 2020
@openshift-ci-robot
Copy link

@vrutkovs: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

[release-4.6] Fix invalid symlink on second boot

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 vrutkovs added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. labels Nov 21, 2020
@vrutkovs vrutkovs mentioned this pull request Nov 21, 2020
Closed
@vrutkovs
Layer root/* files on host
c7c9809 
This replaces `echo -n` way to create files on host
@vrutkovs
Remove all refs from extracted ostree commit except the desired
e7e11c4 
FCOS now adds a tag for the version, which confuses bootstrap (it expects a single ref)
@vrutkovs
overlay/usr/lib/tmpfiles.d/etc.conf: remove /etc/resolv.conf symlink
be5215f 
Fedora 33 creates /etc/resolv.conf pointing to systemd-resolved file. OKD OS should avoid creating it, so that /etc/resolv.conf is managed by NM
@vrutkovs vrutkovs force-pushed the run-systemd-resolved branch from 856c28e to be5215f Compare November 21, 2020 10:33
@vrutkovs
Copy link
Member Author

/test e2e-gcp

1 similar comment
@vrutkovs
Copy link
Member Author

/test e2e-gcp

@vrutkovs vrutkovs added the lgtm Indicates that a PR is ready to be merged. label Nov 21, 2020
@openshift-merge-robot openshift-merge-robot merged commit 80329d3 into openshift:release-4.6 Nov 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LorbusChris LorbusChris Awaiting requested review from LorbusChris

@smarterclayton smarterclayton Awaiting requested review from smarterclayton

Assignees
No one assigned
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. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@vrutkovs @openshift-ci-robot @openshift-merge-robot