Skip to content

templates: Merge MCD host service and dropin into one config#1755

Closed
LorbusChris wants to merge 1 commit intoopenshift:masterfrom
LorbusChris:merge-unit-dropin
Closed

templates: Merge MCD host service and dropin into one config#1755
LorbusChris wants to merge 1 commit intoopenshift:masterfrom
LorbusChris:merge-unit-dropin

Conversation

@LorbusChris
Copy link
Copy Markdown
Contributor

/cc @runcom

I'm not entirely sure whether the template needs a .yaml suffix for the template replacement to work. Either way, it might be cleaner to rename those .service files to .service.yaml to 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.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.

- How to verify it

  • CI
  • verify the machine-config-daemon-host.service dropin contains the right proxy config

- Description for the changelog
templates: Merge MCD host service and dropin into one config

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.
@openshift-ci-robot openshift-ci-robot requested a review from runcom May 27, 2020 10:27
@runcom
Copy link
Copy Markdown
Member

runcom commented May 27, 2020

/approve

@openshift-ci-robot
Copy link
Copy Markdown
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

Details 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 27, 2020
@LorbusChris
Copy link
Copy Markdown
Contributor Author

This is included in #1678 now
/close

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@LorbusChris: Closed this PR.

Details

In response to this:

This is included in #1678 now
/close

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.

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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants