From 8ff59ff3850eea889b6738d35c0852dc1ebba096 Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Fri, 26 Apr 2019 23:10:18 -0400 Subject: [PATCH] Move default components to an appropriate upgrade order (generic) Now that CVO only applies ordering on update, we are reorganizing the order components are applied to better align with correct upgrades. The order is: 0000_10_*: config-operator 0000_20_*: kube-apiserver 0000_25_*: kube scheduler and controller manager 0000_30_*: other apiservers: openshift and machine 0000_40_*: reserved 0000_50_*: all non-order specific components 0000_60_*: reserved 0000_70_*: disruptive node-level components: dns, sdn, multus 0000_80_*: machine operators 0000_90_*: reserved for any post-machine updates Operators in 0000_50_* should have no prefix (like 0000_70_ before). No other rules of ordering have changed. --- pkg/oc/cli/admin/release/new.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/oc/cli/admin/release/new.go b/pkg/oc/cli/admin/release/new.go index 2e425647f814..ecfdfe9ac42c 100644 --- 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))