Use the correct template when installing as a SystemV service #5044
Conversation
This file contains 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
There are no references to this function. Signed-off-by: Kimmo Lehto <[email protected]>
Since k0s does not run on mac, there's no need for launchd service installer. Signed-off-by: Kimmo Lehto <[email protected]>
The file was empty except for the copyright header and package name. Signed-off-by: Kimmo Lehto <[email protected]>
Unlike openrc, upstart and system v unit file templates, the systemd template was defined in pkg/install/service.go. Here it is extracted into a dedicated file like the other templates. Signed-off-by: Kimmo Lehto <[email protected]>
The customized system V service template was not being used, as the template was put into "SystemdScript" option. The correct option name seems to be "SysVScript". Signed-off-by: Kimmo Lehto <[email protected]>
The openrc unit file template had the "name=" definition twice. I assume it is the last one that was effective. Signed-off-by: Kimmo Lehto <[email protected]>
There are no references to this function. The linter catches is as unused. Signed-off-by: Kimmo Lehto <[email protected]>
kke
force-pushed
the
k0s-install-cleanup-fixes
branch
from
19b07f6
to
416c9ff
Compare
kke
changed the title
ncopa
approved these changes
Sep 26, 2024
twz123
reviewed
Sep 26, 2024
There was a problem hiding this comment.
I wonder if it would make more sense to put the template into its dedicated file and use go:embed to put it into a string variable somewhere.
There was a problem hiding this comment.
There doesn't seem to be an established filename extension for go's text/template format files, if there was, it would be nice for editor benefits.
There was a problem hiding this comment.
https://marketplace.visualstudio.com/items?itemName=jinliming2.vscode-go-template
Seems to hint towards using *.go.txt, *.go.tpl, *.go.tmpl, *.gtpl.
jnummelin
added
backport/release-1.28
|
Successfully created backport PR for |
|
Successfully created backport PR for |
|
Successfully created backport PR for |
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.
Description
Several fixes in separate commits as preparation for #4962
The first one fixes a bug and the PR title has been derived from that. The rest are just housekeeping.
Use SysVScript for system v, not SystemdScript
The customized system V service template from
pkg/install/linux_sysv.gowas not being used, as thetemplate was assigned to
SystemdScriptoption. The correct option name seems to beSysVScript.Remove double "name" field from openrc script
The openrc unit file template had the "name=" definition twice. I assume
it is the last one that was effective.
Extract systemd template to pkg/install/linux_systemd.go
Unlike OpenRC, Upstart and SystemV unit file templates, the systemd
template was defined in
pkg/install/service.go. Here it has been extractedinto a dedicated file like the other templates.
Remove empty pkg/install/process.go
The file was empty except for the copyright header and package name.
Remove unused darwin launchd integration
Since k0s does not run on mac, there's no need for launchd service
installer.
Remove unused install.GetSysInit() function
There are no references to this function.
Remove unused prepareEnvVars function
There are no references to this function.
Type of change
How Has This Been Tested?
Checklist: