From 53de2c44fdd8c5e207480e1262a4e86a820a230d Mon Sep 17 00:00:00 2001 From: AhmedGrati Date: Tue, 24 Oct 2023 23:08:34 +0100 Subject: [PATCH] fix failing unit tests Signed-off-by: AhmedGrati --- pkg/transformer/kubernetes/k8sutils.go | 1 + pkg/transformer/kubernetes/kubernetes.go | 2 ++ 2 files changed, 3 insertions(+) diff --git a/pkg/transformer/kubernetes/k8sutils.go b/pkg/transformer/kubernetes/k8sutils.go index 5ea78e13..03967e49 100644 --- a/pkg/transformer/kubernetes/k8sutils.go +++ b/pkg/transformer/kubernetes/k8sutils.go @@ -687,6 +687,7 @@ func getServiceGroupID(service kobject.ServiceConfig, mode string) string { func KomposeObjectToServiceConfigGroupMapping(komposeObject *kobject.KomposeObject, opt kobject.ConvertOptions) map[string]kobject.ServiceConfigGroup { serviceConfigGroup := make(map[string]kobject.ServiceConfigGroup) sortedServiceConfigs := SortedKeys(komposeObject.ServiceConfigs) + for _, service := range sortedServiceConfigs { serviceConfig := komposeObject.ServiceConfigs[service] groupID := getServiceGroupID(serviceConfig, opt.ServiceGroupMode) diff --git a/pkg/transformer/kubernetes/kubernetes.go b/pkg/transformer/kubernetes/kubernetes.go index e0d5a471..3ced87bf 100644 --- a/pkg/transformer/kubernetes/kubernetes.go +++ b/pkg/transformer/kubernetes/kubernetes.go @@ -1473,6 +1473,8 @@ func (k *Kubernetes) Transform(komposeObject kobject.KomposeObject, opt kobject. } groupName = strings.Join(names, "-") } + } else { + groupName = group } // added a container