forked from LaconicNetwork/kompose
fix: remove e2e flakiness by making the loop deterministic
Signed-off-by: AhmedGrati <ahmedgrati1999@gmail.com>
This commit is contained in:
parent
3172bc05b5
commit
0a3b1897c0
@ -686,14 +686,15 @@ func getServiceGroupID(service kobject.ServiceConfig, mode string) string {
|
||||
// A warn/info message should be printed to let the user know.
|
||||
func KomposeObjectToServiceConfigGroupMapping(komposeObject *kobject.KomposeObject, opt kobject.ConvertOptions) map[string]kobject.ServiceConfigGroup {
|
||||
serviceConfigGroup := make(map[string]kobject.ServiceConfigGroup)
|
||||
|
||||
for name, service := range komposeObject.ServiceConfigs {
|
||||
groupID := getServiceGroupID(service, opt.ServiceGroupMode)
|
||||
sortedServiceConfigs := SortedKeys(komposeObject.ServiceConfigs)
|
||||
for _, service := range sortedServiceConfigs {
|
||||
serviceConfig := komposeObject.ServiceConfigs[service]
|
||||
groupID := getServiceGroupID(serviceConfig, opt.ServiceGroupMode)
|
||||
if groupID != "" {
|
||||
service.Name = name
|
||||
service.InGroup = true
|
||||
serviceConfigGroup[groupID] = append(serviceConfigGroup[groupID], service)
|
||||
komposeObject.ServiceConfigs[name] = service
|
||||
serviceConfig.Name = service
|
||||
serviceConfig.InGroup = true
|
||||
serviceConfigGroup[groupID] = append(serviceConfigGroup[groupID], serviceConfig)
|
||||
komposeObject.ServiceConfigs[service] = serviceConfig
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -39,6 +39,14 @@ spec:
|
||||
io.kompose.service: librenms-dispatcher
|
||||
spec:
|
||||
containers:
|
||||
- env:
|
||||
- name: TZ
|
||||
image: librenms/dispatcher:latest
|
||||
name: dispatcher
|
||||
resources: {}
|
||||
volumeMounts:
|
||||
- mountPath: /data
|
||||
name: librenms-dispatcher-claim0
|
||||
- env:
|
||||
- name: TZ
|
||||
image: librenms/librenms:latest
|
||||
@ -51,15 +59,7 @@ spec:
|
||||
volumeMounts:
|
||||
- mountPath: /data
|
||||
name: librenms-dispatcher-claim0
|
||||
- env:
|
||||
- name: TZ
|
||||
image: librenms/dispatcher:latest
|
||||
name: dispatcher
|
||||
resources: {}
|
||||
volumeMounts:
|
||||
- mountPath: /data
|
||||
name: librenms-dispatcher-claim0
|
||||
hostname: dispatcher
|
||||
hostname: librenms
|
||||
restartPolicy: Always
|
||||
volumes:
|
||||
- name: librenms-dispatcher-claim0
|
||||
|
||||
Loading…
Reference in New Issue
Block a user