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

templates: Migrate from Container Linux to Fedora CoreOS config format #1678

Merged
merged 3 commits into from Jun 4, 2020
Merged

templates: Migrate from Container Linux to Fedora CoreOS config format #1678

merged 3 commits into from Jun 4, 2020

Conversation

LorbusChris
Copy link
Member

@LorbusChris LorbusChris commented Apr 23, 2020 •
edited

Migrate from Container Linux to Fedora CoreOS config format
Right now this retains support for CL configs although I think this might not be necessary.

@openshift/openshift-team-mco

Blocked on: #1677
/hold
until master/4.6 opens

- What I did

  • templates: Merge MCD host service and dropin into one config
  • templates: Name all systemd unit configs *.service.yaml
  • pkgs/controller: Add support for transpiling Fedora CoreOS configs
    Adds support to the template renderer for transpiling Fedora CoreOS
    configs to Ignition spec v2 config
  • Update vendor
  • templates: Migrate to FC config format
    Drops the the filesystem field on all templates to make them
    adhere to FC config format.

- How to verify it
CI e2e

- Description for the changelog
templates: Migrate to FC config format

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 23, 2020
LorbusChris
LorbusChris commented Apr 23, 2020
View reviewed changes
pkg/controller/template/render_test.go
@@ -230,8 +230,8 @@ func TestSkipMissing(t *testing.T) {
}

const (
templateDir = "../../../templates"
resultDir = "./test_data/templates"
Copy link
Member Author

Choose a reason for hiding this comment

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

resultDir wasn't used anywhere afaict

@runcom
Copy link
Member

runcom commented Apr 27, 2020

Awesome

/approve

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 27, 2020
@LorbusChris LorbusChris force-pushed the fcct-templates branch 3 times, most recently from fd81a79 to 8924010 Compare April 27, 2020 22:10
@LorbusChris
Copy link
Member Author

/test images

@sinnykumari
Copy link
Contributor

/retest

1 similar comment
@runcom
Copy link
Member

runcom commented Apr 28, 2020

/retest

@LorbusChris
Copy link
Member Author

I think I should probably remove CL config support altogether here. Nobody is going to ever run MCO with CL templates after this again, and there's no support for a mixed set of configs in this PR anyway (so it would have to be CL-only templates)

This was referenced Apr 30, 2020
Merged
Closed
@LorbusChris
Copy link
Member Author

/retest

@LorbusChris
Copy link
Member Author

/test e2e-gcp-op

1 similar comment
@LorbusChris
Copy link
Member Author

/test e2e-gcp-op

@LorbusChris
Copy link
Member Author

/retest

@LorbusChris
Copy link
Member Author

LorbusChris commented May 27, 2020 •
edited

Requires: #1755

EDIT: commits are included in this PR now

@LorbusChris LorbusChris mentioned this pull request May 27, 2020
Closed
@LorbusChris
Copy link
Member Author

/retest

@LorbusChris
Copy link
Member Author

Lifting the hold now that 4.6 is open
/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 2, 2020
yuqi-zhang
yuqi-zhang approved these changes Jun 3, 2020
View reviewed changes
Copy link
Contributor

@yuqi-zhang yuqi-zhang 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, lets get this into 4.6, thanks!
/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 3, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: LorbusChris, runcom, yuqi-zhang

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

/retest

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

4 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.

@LorbusChris
Copy link
Member Author

/retest

@openshift-bot
Copy link
Contributor

/retest

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

2 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.

@cgwalters
Copy link
Member

Took a quick look, I think these are known flakes.

@LorbusChris
Copy link
Member Author

/retest

@openshift-bot
Copy link
Contributor

/retest

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

7 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.

@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.

@LorbusChris LorbusChris mentioned this pull request Jun 3, 2020
Closed
@LorbusChris
Copy link
Member Author

/retest

@openshift-ci-robot
Copy link
Contributor

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

Test name Commit Details Rerun command
ci/prow/e2e-aws-scaleup-rhel7 fc667e5 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.

@openshift-merge-robot openshift-merge-robot merged commit 36ba27c into openshift:master Jun 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yuqi-zhang yuqi-zhang yuqi-zhang approved these changes

@mtrmac mtrmac Awaiting requested review from mtrmac

@umohnani8 umohnani8 Awaiting requested review from umohnani8

Assignees

@yuqi-zhang yuqi-zhang

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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@LorbusChris @runcom @sinnykumari @openshift-ci-robot @openshift-bot @cgwalters @yuqi-zhang @openshift-merge-robot