Skip to content

OKD-194: Add OKD cincinnati as the default update service for OKD #10834

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

Open
jatinsu wants to merge 2 commits into
base: main
Choose a base branch
from
+0 −9
Open

OKD-194: Add OKD cincinnati as the default update service for OKD #10834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
140932c
Add OKD cincinnati as the default update service for OKD
jatinsu Aug 31, 2026
e1aa4af
Remove unused IsSCOS template data
jatinsu Sep 2, 2026
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
5 changes: 0 additions & 5 deletions 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 @@ -4,12 +4,7 @@ metadata:
namespace: openshift-cluster-version
name: version
spec:
{{- if .IsSCOS }}
Comment thread
jatinsu marked this conversation as resolved.
upstream: https://amd64.origin.releases.ci.openshift.org/graph
channel: stable-scos-4
{{- else }}
channel: {{.CVOChannel}}
{{- end }}
clusterID: {{.CVOClusterID}}
{{- if .CVOCapabilities }}
capabilities:
Expand Down
2 changes: 0 additions & 2 deletions pkg/asset/ignition/bootstrap/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ type bootstrapTemplateData struct {
BootstrapInPlace *types.BootstrapInPlace
UseIPv6ForNodeIP bool
UseDualForNodeIP bool
IsSCOS bool
IsOKD bool
BootstrapNodeIP string
APIServerURL string
Expand Down Expand Up @@ -416,7 +415,6 @@ func (a *Common) getTemplateData(dependencies asset.Parents, bootstrapInPlace bo
BootstrapInPlace: bootstrapInPlaceConfig,
UseIPv6ForNodeIP: ipv6Primary,
UseDualForNodeIP: hasIPv4 && hasIPv6,
IsSCOS: installConfig.Config.IsSCOS(),
IsOKD: installConfig.Config.IsOKD(),
BootstrapNodeIP: bootstrapNodeIP,
APIServerURL: apiURL,
Expand Down
1 change: 0 additions & 1 deletion pkg/asset/manifests/operators.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,6 @@ func (m *Manifests) generateBootKubeManifests(dependencies asset.Parents) []*ass
RootCaCert: string(rootCA.Cert()),
RootCACertBase64: base64.StdEncoding.EncodeToString(rootCA.Cert()),
RootCASignerKeyBase64: base64.StdEncoding.EncodeToString(rootCA.Key()),
IsSCOS: installConfig.Config.IsSCOS(),
IsOKD: installConfig.Config.IsOKD(),
}

Expand Down
1 change: 0 additions & 1 deletion pkg/asset/manifests/template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ type bootkubeTemplateData struct {
EtcdSignerClientCert string
EtcdSignerClientKey string
EtcdSignerKey string
IsSCOS bool
IsOKD bool
McsTLSCert string
McsTLSKey string
Expand Down