|
|
@ -41,7 +41,6 @@ type Manifest struct {
|
|
|
|
type manifestFile struct {
|
|
|
|
type manifestFile struct {
|
|
|
|
entries map[string]string
|
|
|
|
entries map[string]string
|
|
|
|
path string
|
|
|
|
path string
|
|
|
|
apis chartutil.VersionSet
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// result is an intermediate structure used during sorting.
|
|
|
|
// result is an intermediate structure used during sorting.
|
|
|
@ -75,7 +74,7 @@ var events = map[string]release.HookEvent{
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// Files that do not parse into the expected format are simply placed into a map and
|
|
|
|
// Files that do not parse into the expected format are simply placed into a map and
|
|
|
|
// returned.
|
|
|
|
// returned.
|
|
|
|
func SortManifests(files map[string]string, apis chartutil.VersionSet, ordering KindSortOrder) ([]*release.Hook, []Manifest, error) {
|
|
|
|
func SortManifests(files map[string]string, _ chartutil.VersionSet, ordering KindSortOrder) ([]*release.Hook, []Manifest, error) {
|
|
|
|
result := &result{}
|
|
|
|
result := &result{}
|
|
|
|
|
|
|
|
|
|
|
|
var sortedFilePaths []string
|
|
|
|
var sortedFilePaths []string
|
|
|
@ -100,7 +99,6 @@ func SortManifests(files map[string]string, apis chartutil.VersionSet, ordering
|
|
|
|
manifestFile := &manifestFile{
|
|
|
|
manifestFile := &manifestFile{
|
|
|
|
entries: SplitManifests(content),
|
|
|
|
entries: SplitManifests(content),
|
|
|
|
path: filePath,
|
|
|
|
path: filePath,
|
|
|
|
apis: apis,
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if err := manifestFile.sort(result); err != nil {
|
|
|
|
if err := manifestFile.sort(result); err != nil {
|
|
|
|