assets/manifests: sort files list in manifests assets

The files lists in the manifests assets need to be sorted to ensure that
the assets are equivalent when read from the state file and from on disk.

Changes for https://jira.coreos.com/browse/CORS-940

pkg/asset/asset.go

@@ -5,6 +5,7 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+	"sort"
 
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
@@ -95,3 +96,8 @@ func isDirEmpty(name string) (bool, error) {
 	}
 	return false, err // Either not empty or error, suits both cases
 }
+
+// SortFiles sorts the specified files by file name.
+func SortFiles(files []*File) {
+	sort.Slice(files, func(i, j int) bool { return files[i].Filename < files[j].Filename })
+}

pkg/asset/manifests/openshift.go

@@ -146,6 +146,8 @@ func (o *Openshift) Generate(dependencies asset.Parents) error {
 		})
 	}
 
+	asset.SortFiles(o.FileList)
+
 	return nil
 }
 
@@ -161,5 +163,6 @@ func (o *Openshift) Load(f asset.FileFetcher) (bool, error) {
 		return false, err
 	}
 	o.FileList = fileList
+	asset.SortFiles(o.FileList)
 	return len(fileList) > 0, nil
 }

pkg/asset/manifests/operators.go

@@ -116,6 +116,8 @@ func (m *Manifests) Generate(dependencies asset.Parents) error {
 	m.FileList = append(m.FileList, network.Files()...)
 	m.FileList = append(m.FileList, infra.Files()...)
 
+	asset.SortFiles(m.FileList)
+
 	return nil
 }
 
@@ -264,6 +266,8 @@ func (m *Manifests) Load(f asset.FileFetcher) (bool, error) {
 
 	m.FileList, m.KubeSysConfig = fileList, kubeSysConfig
 
+	asset.SortFiles(m.FileList)
+
 	return true, nil
 }
 

pkg/asset/store/filefetcher.go

@@ -3,7 +3,6 @@ package store
 import (
 	"io/ioutil"
 	"path/filepath"
-	"sort"
 
 	"github.com/openshift/installer/pkg/asset"
 )
@@ -46,6 +45,5 @@ func (f *fileFetcher) FetchByPattern(pattern string) (files []*asset.File, err e
 		})
 	}
 
-	sort.Slice(files, func(i, j int) bool { return files[i].Filename < files[j].Filename })
 	return files, nil
 }