kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1966 from justinsb/tf_sort_ephemeral 

Output ephemeral devices in terraform in consistent order
This commit is contained in:
Eric Hole 2017-02-23 05:46:01 -05:00 committed by GitHub
parent 5813ed9464 51a1cddafc
commit 65aa5343e6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
upup/pkg/fi/cloudup/awstasks/launchconfiguration.go
View File

@ -29,6 +29,7 @@ import (
"k8s.io/kops/upup/pkg/fi/cloudup/awsup" "k8s.io/kops/upup/pkg/fi/cloudup/awsup"
"k8s.io/kops/upup/pkg/fi/cloudup/cloudformation" "k8s.io/kops/upup/pkg/fi/cloudup/cloudformation"
"k8s.io/kops/upup/pkg/fi/cloudup/terraform" "k8s.io/kops/upup/pkg/fi/cloudup/terraform"
"k8s.io/kubernetes/pkg/util/sets"
"sort" "sort"
"time" "time"
) )
@ -404,7 +405,8 @@ func (_ *LaunchConfiguration) RenderTerraform(t *terraform.TerraformTarget, a, e
if len(ephemeralDevices) != 0 { if len(ephemeralDevices) != 0 {
tf.EphemeralBlockDevice = []*terraformBlockDevice{} tf.EphemeralBlockDevice = []*terraformBlockDevice{}
for deviceName, bdm := range ephemeralDevices { for _, deviceName := range sets.StringKeySet(ephemeralDevices).List() {
bdm := ephemeralDevices[deviceName]
tf.EphemeralBlockDevice = append(tf.EphemeralBlockDevice, &terraformBlockDevice{ tf.EphemeralBlockDevice = append(tf.EphemeralBlockDevice, &terraformBlockDevice{
VirtualName: bdm.VirtualName, VirtualName: bdm.VirtualName,
DeviceName: fi.String(deviceName), DeviceName: fi.String(deviceName),