templates: Merge MCD host service and dropin into one config#1755
Closed
LorbusChris wants to merge 1 commit intoopenshift:masterfrom
Closed
templates: Merge MCD host service and dropin into one config#1755LorbusChris wants to merge 1 commit intoopenshift:masterfrom
LorbusChris wants to merge 1 commit intoopenshift:masterfrom
Conversation
In order to not create two separate configs for the `machine-config-daemon-host.service` unit's contents and dropins, merge them into one. Having separate config files for a systemd unit and its dropins works with the Container Linux Config Transpiler, but it won't work with the Fedora CoreOS Config Transpiler as Ignition Config Spec v3 does not allow for nor merge duplicate unit definitions.
Member
|
/approve |
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: LorbusChris, runcom The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Contributor
Author
|
This is included in #1678 now |
Contributor
|
@LorbusChris: Closed this PR. DetailsIn response to this:
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. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
/cc @runcom
I'm not entirely sure whether the template needs a
.yamlsuffix for the template replacement to work. Either way, it might be cleaner to rename those.servicefiles to.service.yamlto reflect the fact that they actually contain yaml.- What I did
In order to not create two separate configs for the
machine-config-daemon-host.serviceunit's contents and dropins,merge them into one.
Having separate config files for a systemd unit and its dropins works
with the Container Linux Config Transpiler, but it won't work with the
Fedora CoreOS Config Transpiler as Ignition Config Spec v3 does not
allow for nor merge duplicate unit definitions.
- How to verify it
machine-config-daemon-host.servicedropin contains the right proxy config- Description for the changelog
templates: Merge MCD host service and dropin into one config