Merge pull request #22690 from smarterclayton/upgrade_order

openshift-merge-robot · web-flow · commit a1a3825e4b83 · 2019-04-27T15:38:55.000-07:00
Move default components to an appropriate upgrade order (generic)
diff --git a/pkg/oc/cli/admin/release/new.go b/pkg/oc/cli/admin/release/new.go
@@ -1305,7 +1305,7 @@ func writePayload(w io.Writer, is *imageapi.ImageStream, cm *CincinnatiMetadata,
 			// get put in a scoped bucket at the end. Only a few components should need to
 			// be in the global order.
 			if !strings.HasPrefix(filename, "0000_") {
-				filename = fmt.Sprintf("0000_70_%s_%s", name, filename)
+				filename = fmt.Sprintf("0000_50_%s_%s", name, filename)
 			}
 			if count, ok := files[filename]; ok {
 				ext := path.Ext(path.Base(filename))

Original file line number	Diff line number	Diff line change
`@@ -1305,7 +1305,7 @@ func writePayload(w io.Writer, is imageapi.ImageStream, cm CincinnatiMetadata,`
`1305`	`1305`	`// get put in a scoped bucket at the end. Only a few components should need to`
`1306`	`1306`	`// be in the global order.`
`1307`	`1307`	`if !strings.HasPrefix(filename, "0000_") {`
`1308`		`- filename = fmt.Sprintf("0000_70_%s_%s", name, filename)`
	`1308`	`+ filename = fmt.Sprintf("0000_50_%s_%s", name, filename)`
`1309`	`1309`	`}`
`1310`	`1310`	`if count, ok := files[filename]; ok {`
`1311`	`1311`	`ext := path.Ext(path.Base(filename))`