From 6e0b934f77b31988b24aa5ff4a22e21eea7429c7 Mon Sep 17 00:00:00 2001 From: Abhishek Date: Fri, 24 Mar 2017 09:53:39 +0530 Subject: [PATCH] Propagate underscores into valid names Now we can provide service name with "_" in docker-compose files and they will by converted as "-" in the generated artifacts by kompose eg, if the service name in docker-compose file is "foo_bar" then it will be converted into "foo-bar" in the generated artifacts --- pkg/loader/compose/compose.go | 5 ++++- pkg/transformer/kubernetes/kubernetes.go | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/loader/compose/compose.go b/pkg/loader/compose/compose.go index f2d33992..5e0c9522 100644 --- a/pkg/loader/compose/compose.go +++ b/pkg/loader/compose/compose.go @@ -374,7 +374,10 @@ func (c *Compose) LoadFile(files []string) (kobject.KomposeObject, error) { serviceConfig.Tty = composeServiceConfig.Tty serviceConfig.MemLimit = composeServiceConfig.MemLimit serviceConfig.TmpFs = composeServiceConfig.Tmpfs - komposeObject.ServiceConfigs[name] = serviceConfig + komposeObject.ServiceConfigs[normalizeServiceNames(name)] = serviceConfig + if normalizeServiceNames(name) != name { + log.Infof("Service name in docker-compose has been changed from %q to %q", name, normalizeServiceNames(name)) + } } return komposeObject, nil diff --git a/pkg/transformer/kubernetes/kubernetes.go b/pkg/transformer/kubernetes/kubernetes.go index ed12322b..1c93b72f 100644 --- a/pkg/transformer/kubernetes/kubernetes.go +++ b/pkg/transformer/kubernetes/kubernetes.go @@ -637,7 +637,7 @@ func (k *Kubernetes) Deploy(komposeObject kobject.KomposeObject, opt kobject.Con if !opt.EmptyVols { pvcStr = " and PersistentVolumeClaims " } - fmt.Println("We are going to create Kubernetes Deployments, Services" + pvcStr + "for your Dockerized application. \n" + + log.Info("We are going to create Kubernetes Deployments, Services" + pvcStr + "for your Dockerized application. " + "If you need different kind of resources, use the 'kompose convert' and 'kubectl create -f' commands instead. \n") client, namespace, err := k.GetKubernetesClient()