Merge pull request #10655 from patrickdillon/cvo-version

no-jira: dynamically set CVO upgrade version

Author: openshift-merge-bot[bot]

data/data/manifests/bootkube/cvo-overrides.yaml.template

@@ -8,7 +8,7 @@ spec:
   upstream: https://amd64.origin.releases.ci.openshift.org/graph
   channel: stable-scos-4
 {{- else }}
-  channel: stable-4.22
+  channel: {{.CVOChannel}}
 {{- end }}
   clusterID: {{.CVOClusterID}}
 {{- if .CVOCapabilities }}

pkg/asset/manifests/operators.go

@@ -5,6 +5,7 @@ import (
 	"bytes"
 	"context"
 	"encoding/base64"
+	"fmt"
 	"path"
 	"path/filepath"
 	"strings"
@@ -24,6 +25,7 @@ import (
 	"github.com/openshift/installer/pkg/asset/templates/content/manifests"
 	"github.com/openshift/installer/pkg/asset/tls"
 	"github.com/openshift/installer/pkg/types"
+	"github.com/openshift/installer/pkg/version/versioninfo"
 	"github.com/openshift/library-go/pkg/crypto"
 )
 
@@ -170,8 +172,12 @@ func (m *Manifests) generateBootKubeManifests(dependencies asset.Parents) []*ass
 		rootCA,
 	)
 
+	versionInfo := versioninfo.GetInfo()
+	cvoChannel := fmt.Sprintf("stable-%d.%d", versionInfo.Major, versionInfo.Minor)
+
 	templateData := &bootkubeTemplateData{
 		CVOCapabilities:       installConfig.Config.Capabilities,
+		CVOChannel:            cvoChannel,
 		CVOClusterID:          clusterID.UUID,
 		McsTLSCert:            base64.StdEncoding.EncodeToString(mcsCertKey.Cert()),
 		McsTLSKey:             base64.StdEncoding.EncodeToString(mcsCertKey.Key()),

pkg/asset/manifests/template.go

@@ -67,6 +67,7 @@ type cloudCredsSecretData struct {
 
 type bootkubeTemplateData struct {
 	CVOCapabilities            *types.Capabilities
+	CVOChannel                 string
 	CVOClusterID               string
 	EtcdCaBundle               string
 	EtcdMetricCaCert           string