Skip to content

[FCOS] bootstrap: replace CRIO's hooks dir on bootstrap#2795

Merged
openshift-merge-robot merged 2 commits intoopenshift:fcosfrom
vrutkovs:fcos-crio-hooks-bootstrap
Dec 12, 2019
Merged

[FCOS] bootstrap: replace CRIO's hooks dir on bootstrap#2795
openshift-merge-robot merged 2 commits intoopenshift:fcosfrom
vrutkovs:fcos-crio-hooks-bootstrap

Conversation

@vrutkovs
Copy link
Copy Markdown
Contributor

@vrutkovs vrutkovs commented Dec 11, 2019 •
edited
Loading

This would ensure CRIO's bootstrap would use FCOS-compatible hooks dir.

PR openshift/machine-config-operator#1311 would
do the same for masters and workers.

This also ensures mkdir calls have --parent so that these would not fail if dirs already exist

/cc @LorbusChris @smarterclayton

bootstrap: replace CRIO's hooks dir on bootstrap
07911f0 
This would ensure CRIO's bootstrap would use FCOS-compatible hooks dir.

PR openshift/machine-config-operator#1311 would 
do the same for masters and workers
@openshift-ci-robot openshift-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Dec 11, 2019
@smarterclayton
Copy link
Copy Markdown
Contributor

smarterclayton commented Dec 11, 2019

Is there a reason not to support both locations? I.e. can't we tolerate both?

@vrutkovs vrutkovs mentioned this pull request Dec 11, 2019
Merged
@vrutkovs
Copy link
Copy Markdown
Contributor Author

vrutkovs commented Dec 11, 2019

Crio chokes if one of the directories doesn't exist

@LorbusChris
Copy link
Copy Markdown
Contributor

LorbusChris commented Dec 11, 2019

This is because oci-systemd-hook (which owned that one dir) was dropped from FCOS and RHEL, but not yet from RHCOS. Should be relevant to master as well, because afaik they'll remove it, too, in RHCOS.
ref https://bugzilla.redhat.com/show_bug.cgi?id=1781019

/lgtm
/cherry-pick master

@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Dec 11, 2019

@LorbusChris: once the present PR merges, I will cherry-pick it on top of master in a new PR and assign it to you.

Details

In response to this:

This is because oci-systemd-hook (which owned that one dir) was dropped from FCOS and RHEL, but not yet from RHCOS. Should be relevant to master as well, because afaik they'll remove it, too, in RHCOS.
ref https://bugzilla.redhat.com/show_bug.cgi?id=1781019

/lgtm
/cherry-pick master

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 lgtm Indicates that a PR is ready to be merged. label Dec 11, 2019
@vrutkovs vrutkovs closed this Dec 11, 2019
@vrutkovs vrutkovs reopened this Dec 11, 2019
@vrutkovs
Copy link
Copy Markdown
Contributor Author

vrutkovs commented Dec 11, 2019

/override e2e-vsphere

Needs #2671

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Dec 11, 2019

@vrutkovs: /override requires a failed status context to operate on.
The following unknown contexts were given:

  • e2e-vsphere

Only the following contexts were expected:

  • ci/prow/e2e-aws
  • ci/prow/e2e-vsphere
  • ci/prow/gofmt
  • ci/prow/golint
  • ci/prow/govet
  • ci/prow/images
  • ci/prow/shellcheck
  • ci/prow/tf-fmt
  • ci/prow/tf-lint
  • ci/prow/unit
  • ci/prow/verify-vendor
  • ci/prow/yaml-lint
  • tide
Details

In response to this:

/override e2e-vsphere

Needs #2671

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
Copy link
Copy Markdown
Contributor Author

vrutkovs commented Dec 11, 2019

/override ci/prow/e2e-vsphere

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Dec 11, 2019

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

Details

In response to this:

/override ci/prow/e2e-vsphere

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

cgwalters commented Dec 11, 2019

Man, oci-systemd-hook. I have honestly lost track of whether we're really supporting it or not.

@vrutkovs
Copy link
Copy Markdown
Contributor Author

vrutkovs commented Dec 11, 2019 

mkdir: cannot create directory ‘/etc/pivot’: File exists

I'll add a patch to fix mkdir calls

@abhinavdahiya abhinavdahiya changed the title bootstrap: replace CRIO's hooks dir on bootstrap [FCOS] bootstrap: replace CRIO's hooks dir on bootstrap Dec 11, 2019
@LorbusChris
Copy link
Copy Markdown
Contributor

LorbusChris commented Dec 11, 2019 •
edited
Loading

Man, oci-systemd-hook. I have honestly lost track of whether we're really supporting it or not.

@cgwalters I don't think we support it any longer: https://src.fedoraproject.org/rpms/oci-systemd-hook/c/d5081a1acda993325729a45202fa87598c89696a?branch=master

This may be different in RHCOS, though, but IIRC @miabbott mentioned something about dropping it from there as well.

@vrutkovs
Copy link
Copy Markdown
Contributor Author

vrutkovs commented Dec 11, 2019

/retest

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

LorbusChris commented Dec 11, 2019

/lgtm

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

openshift-ci-robot commented Dec 11, 2019

[APPROVALNOTIFIER] This PR is APPROVED

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

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 [LorbusChris,vrutkovs]

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
Copy Markdown
Contributor

openshift-bot commented Dec 12, 2019

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Dec 12, 2019

/retest

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

15 similar comments
@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Dec 12, 2019

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Dec 12, 2019

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Dec 12, 2019

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Dec 12, 2019

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Dec 12, 2019

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Dec 12, 2019

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Dec 12, 2019

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Dec 12, 2019

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Dec 12, 2019

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Dec 12, 2019

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Dec 12, 2019

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Dec 12, 2019

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Dec 12, 2019

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Dec 12, 2019

/retest

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

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Dec 12, 2019

/retest

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

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Dec 12, 2019

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

Test name Commit Details Rerun command
ci/prow/e2e-vsphere f55a872 link /test e2e-vsphere
ci/prow/e2e-aws f55a872 link /test e2e-aws

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.

Details

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.

@vrutkovs
Copy link
Copy Markdown
Contributor Author

vrutkovs commented Dec 12, 2019

Bootstrap has started crio in run 219

/override ci/prow/e2e-aws
/override ci/prow/e2e-vsphere

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Dec 12, 2019

@vrutkovs: Overrode contexts on behalf of vrutkovs: ci/prow/e2e-aws, ci/prow/e2e-vsphere

Details

In response to this:

Bootstrap has started crio in run 219

/override ci/prow/e2e-aws
/override ci/prow/e2e-vsphere

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-merge-robot openshift-merge-robot merged commit 3cff8b5 into openshift:fcos Dec 12, 2019
@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Dec 12, 2019

@LorbusChris: #2795 failed to apply on top of branch "master":

Applying: bootkube.sh: use mkdir -p to continue if dirs already exist
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	data/data/bootstrap/files/usr/local/bin/bootkube.sh.template
Falling back to patching base and 3-way merge...
Auto-merging data/data/bootstrap/files/usr/local/bin/bootkube.sh.template
CONFLICT (content): Merge conflict in data/data/bootstrap/files/usr/local/bin/bootkube.sh.template
Patch failed at 0002 bootkube.sh: use mkdir -p to continue if dirs already exist
Details

In response to this:

This is because oci-systemd-hook (which owned that one dir) was dropped from FCOS and RHEL, but not yet from RHCOS. Should be relevant to master as well, because afaik they'll remove it, too, in RHCOS.
ref https://bugzilla.redhat.com/show_bug.cgi?id=1781019

/lgtm
/cherry-pick master

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

LorbusChris commented Dec 12, 2019

@vrutkovs automated cherry-pck failed, mind rebasing this on top of master for a PR there?

@vrutkovs vrutkovs mentioned this pull request Dec 12, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@smarterclayton smarterclayton Awaiting requested review from smarterclayton

1 more reviewer

@LorbusChris LorbusChris LorbusChris approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@LorbusChris LorbusChris

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@vrutkovs @smarterclayton @LorbusChris @openshift-cherrypick-robot @openshift-ci-robot @cgwalters @openshift-bot @openshift-merge-robot