Merge pull request #3929 from justinsb/add_service_extension_if_not_exists

Automatic merge from submit-queue.

Don't add .service extension if already there
This commit is contained in:
Kubernetes Submit Queue 2017-11-26 16:45:29 -08:00 committed by GitHub
commit 0a2f949fd9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 5 deletions

View File

@ -53,12 +53,12 @@ func (h *HookBuilder) Build(c *fi.ModelBuilderContext) error {
var name string
switch hook.Name {
case "":
name = fmt.Sprintf("kops-hook-%d.service", j)
name = fmt.Sprintf("kops-hook-%d", j)
if isInstanceGroup {
name = fmt.Sprintf("%s-ig.service", name)
name += "-ig"
}
default:
name = fmt.Sprintf("%s.service", hook.Name)
name = hook.Name
}
if _, found := hookNames[name]; found {
@ -72,7 +72,7 @@ func (h *HookBuilder) Build(c *fi.ModelBuilderContext) error {
enabled := false
managed := true
c.AddTask(&nodetasks.Service{
Name: hook.Name,
Name: ensureSystemdSuffix(name),
ManageState: &managed,
Enabled: &enabled,
Running: &enabled,
@ -94,6 +94,14 @@ func (h *HookBuilder) Build(c *fi.ModelBuilderContext) error {
return nil
}
// ensureSystemdSuffix makes sure that we have a .service suffix on the name, needed on needed versions of systems
func ensureSystemdSuffix(name string) string {
if !strings.HasSuffix(name, ".service") && !strings.HasSuffix(name, ".timer") {
name += ".service"
}
return name
}
// buildSystemdService is responsible for generating the service
func (h *HookBuilder) buildSystemdService(name string, hook *kops.HookSpec) (*nodetasks.Service, error) {
// perform some basic validation
@ -130,7 +138,7 @@ func (h *HookBuilder) buildSystemdService(name string, hook *kops.HookSpec) (*no
}
service := &nodetasks.Service{
Name: name,
Name: ensureSystemdSuffix(name),
Definition: s(unit.Render()),
}