changed container normalization to use its new own normalization func…

…tion
kubernetes · Aug 11, 2018 · 1d1e13f · 1d1e13f
1 parent 2ed339c
commit 1d1e13f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/pkg/loader/compose/utils.go b/pkg/loader/compose/utils.go
@@ -113,6 +113,10 @@ func handleServiceType(ServiceType string) (string, error) {
 	}
 }
 
+func normalizeContainerNames(svcName string) string {
+	return strings.ToLower(svcName)
+}
+
 func normalizeServiceNames(svcName string) string {
 	re := regexp.MustCompile("[._]")
 	return strings.ToLower(re.ReplaceAllString(svcName, "-"))

diff --git a/pkg/loader/compose/v1v2.go b/pkg/loader/compose/v1v2.go
@@ -193,7 +193,7 @@ func libComposeToKomposeMapping(composeObject *project.Project) (kobject.Kompose
 		serviceConfig := kobject.ServiceConfig{}
 		serviceConfig.Image = composeServiceConfig.Image
 		serviceConfig.Build = composeServiceConfig.Build.Context
-		newName := normalizeServiceNames(composeServiceConfig.ContainerName)
+		newName := normalizeContainerNames(composeServiceConfig.ContainerName)
 		serviceConfig.ContainerName = newName
 		if newName != composeServiceConfig.ContainerName {
 			log.Infof("Container name in service %q has been changed from %q to %q", name, composeServiceConfig.ContainerName, newName)

diff --git a/pkg/loader/compose/v3.go b/pkg/loader/compose/v3.go
@@ -270,7 +270,7 @@ func dockerComposeToKomposeMapping(composeObject *types.Config) (kobject.Kompose
 		serviceConfig.Stdin = composeServiceConfig.StdinOpen
 		serviceConfig.Tty = composeServiceConfig.Tty
 		serviceConfig.TmpFs = composeServiceConfig.Tmpfs
-		serviceConfig.ContainerName = normalizeServiceNames(composeServiceConfig.ContainerName)
+		serviceConfig.ContainerName = normalizeContainerNames(composeServiceConfig.ContainerName)
 		serviceConfig.Command = composeServiceConfig.Entrypoint
 		serviceConfig.Args = composeServiceConfig.Command
 		serviceConfig.Labels = composeServiceConfig.Labels