Cleanup plugin builds.

k8sdeps/configmapandsecret/basefactory.go

@@ -18,6 +18,7 @@ package configmapandsecret
 
 import (
 	"fmt"
+	"sort"
 	"strings"
 
 	"github.com/pkg/errors"
@@ -101,13 +102,24 @@ func (bf baseFactory) keyValuesFromPlugins(sources []types.KVSource) ([]kv.Pair,
 		if err != nil {
 			return nil, err
 		}
-		for k, v := range kvs {
-			result = append(result, kv.Pair{Key: k, Value: v})
+		for _, k := range sortedKeys(kvs) {
+			result = append(result, kv.Pair{Key: k, Value: kvs[k]})
 		}
 	}
 	return result, nil
 }
 
+func sortedKeys(m map[string]string) []string {
+	keys := make([]string, len(m))
+	i := 0
+	for k := range m {
+		keys[i] = k
+		i++
+	}
+	sort.Strings(keys)
+	return keys
+}
+
 func (bf baseFactory) keyValuesFromFileSources(sources []string) ([]kv.Pair, error) {
 	var kvs []kv.Pair
 	for _, s := range sources {

k8sdeps/configmapandsecret/basefactory_test.go

@@ -77,14 +77,14 @@ func TestKeyValuesFromPlugins(t *testing.T) {
 				},
 			},
 			expected: []kv.Pair{
-				{
-					Key:   "FOO",
-					Value: "bar",
-				},
 				{
 					Key:   "BAR",
 					Value: "baz",
 				},
+				{
+					Key:   "FOO",
+					Value: "bar",
+				},
 			},
 		},
 		{