From 3e6542e341dbc9169992bf818f757cabcb8fae18 Mon Sep 17 00:00:00 2001
From: Yusuke Kuoka <ykuoka@gmail.com>
Date: Tue, 1 Sep 2020 10:52:08 +0900
Subject: [PATCH] Fix test flake for `commonLabels` (#1449)

Ref https://github.com/roboll/helmfile/pull/1415#issuecomment-684139831
---
 pkg/app/app.go | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkg/app/app.go b/pkg/app/app.go
index 6547c912..352e4c2c 100644
--- a/pkg/app/app.go
+++ b/pkg/app/app.go
@@ -445,10 +445,19 @@ func (a *App) ListReleases(c ListConfigProvider) error {
 				for k, v := range run.state.CommonLabels {
 					r.Labels[k] = v
 				}
-				for k, v := range r.Labels {
+
+				var keys []string
+				for k, _ := range r.Labels {
+					keys = append(keys, k)
+				}
+				sort.Strings(keys)
+
+				for _, k := range keys {
+					v := r.Labels[k]
 					labels = fmt.Sprintf("%s,%s:%s", labels, k, v)
 				}
 				labels = strings.Trim(labels, ",")
+
 				installed := r.Installed == nil || *r.Installed
 				releases = append(releases, &HelmRelease{
 					Name:      r.Name,