From 9b3d690141cbebc8186a3e144b205ff1e98bb77c Mon Sep 17 00:00:00 2001 From: Xiaoyu Zhong Date: Thu, 2 Jan 2020 17:02:23 +0800 Subject: [PATCH] Stabilize sequence of "export xx=xxx" statements --- pkg/model/bootstrapscript.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkg/model/bootstrapscript.go b/pkg/model/bootstrapscript.go index 9adf78145c698..0d2e815f6ca3a 100644 --- a/pkg/model/bootstrapscript.go +++ b/pkg/model/bootstrapscript.go @@ -22,6 +22,7 @@ import ( "encoding/base64" "fmt" "os" + "sort" "strconv" "strings" "text/template" @@ -150,9 +151,17 @@ func (b *BootstrapScript) ResourceNodeUp(ig *kops.InstanceGroup, cluster *kops.C if err != nil { return "", err } + + // Sort keys to have a stable sequence of "export xx=xxx"" statements + var keys []string + for k := range env { + keys = append(keys, k) + } + sort.Strings(keys) + var b bytes.Buffer - for k, v := range env { - b.WriteString(fmt.Sprintf("export %s=%s\n", k, v)) + for _, k := range keys { + b.WriteString(fmt.Sprintf("export %s=%s\n", k, env[k])) } return b.String(), nil },