diff --git a/data/data/manifests/bootkube/cvo-overrides.yaml.template b/data/data/manifests/bootkube/cvo-overrides.yaml.template index c64d13fd982..2474a25971c 100644 --- a/data/data/manifests/bootkube/cvo-overrides.yaml.template +++ b/data/data/manifests/bootkube/cvo-overrides.yaml.template @@ -4,12 +4,7 @@ metadata: namespace: openshift-cluster-version name: version spec: -{{- if .IsSCOS }} - upstream: https://amd64.origin.releases.ci.openshift.org/graph - channel: stable-scos-4 -{{- else }} channel: {{.CVOChannel}} -{{- end }} clusterID: {{.CVOClusterID}} {{- if .CVOCapabilities }} capabilities: diff --git a/pkg/asset/ignition/bootstrap/common.go b/pkg/asset/ignition/bootstrap/common.go index c6c644fb83a..5bb6b9e98e2 100644 --- a/pkg/asset/ignition/bootstrap/common.go +++ b/pkg/asset/ignition/bootstrap/common.go @@ -91,7 +91,6 @@ type bootstrapTemplateData struct { BootstrapInPlace *types.BootstrapInPlace UseIPv6ForNodeIP bool UseDualForNodeIP bool - IsSCOS bool IsOKD bool BootstrapNodeIP string APIServerURL string @@ -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, diff --git a/pkg/asset/manifests/operators.go b/pkg/asset/manifests/operators.go index 6ec71da7501..b11b5d249ab 100644 --- a/pkg/asset/manifests/operators.go +++ b/pkg/asset/manifests/operators.go @@ -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(), } diff --git a/pkg/asset/manifests/template.go b/pkg/asset/manifests/template.go index fb9d4d7f6d0..ca3b1423e05 100644 --- a/pkg/asset/manifests/template.go +++ b/pkg/asset/manifests/template.go @@ -79,7 +79,6 @@ type bootkubeTemplateData struct { EtcdSignerClientCert string EtcdSignerClientKey string EtcdSignerKey string - IsSCOS bool IsOKD bool McsTLSCert string McsTLSKey string