Skip to content

no-jira: dynamically set CVO upgrade version #10655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Jun 25, 2026
+8 −1
Merged

no-jira: dynamically set CVO upgrade version #10655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/data/manifests/bootkube/cvo-overrides.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
6 changes: 6 additions & 0 deletions pkg/asset/manifests/operators.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"bytes"
"context"
"encoding/base64"
"fmt"
"path"
"path/filepath"
"strings"
Expand All @@ -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"
)

Expand Down Expand Up @@ -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()),
Expand Down
1 change: 1 addition & 0 deletions pkg/asset/manifests/template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ type cloudCredsSecretData struct {

type bootkubeTemplateData struct {
CVOCapabilities *types.Capabilities
CVOChannel string
CVOClusterID string
EtcdCaBundle string
EtcdMetricCaCert string
Expand Down