Merge pull request #9970 from sarthakpurohit/remove-fcos-ref

openshift-merge-bot[bot] · web-flow · commit 9312f33fd837 · 2025-10-15T11:12:39.000Z
OKD-237: Remove fcos references
diff --git a/data/data/coreos/fcos.json b/data/data/coreos/fcos.json
diff --git a/data/data/manifests/bootkube/cvo-overrides.yaml.template b/data/data/manifests/bootkube/cvo-overrides.yaml.template
@@ -4,10 +4,7 @@ metadata:
   namespace: openshift-cluster-version
   name: version
 spec:
-{{- if .IsFCOS }}
-  upstream: https://amd64.origin.releases.ci.openshift.org/graph
-  channel: stable-4
-{{- else if .IsSCOS }}
+{{- if .IsSCOS }}
   upstream: https://amd64.origin.releases.ci.openshift.org/graph
   channel: stable-scos-4
 {{- else }}
diff --git a/hack/build-coreos-manifest.go b/hack/build-coreos-manifest.go
@@ -22,10 +22,8 @@ import (
 
 const (
 	streamRHCOSJSON            = "data/data/coreos/rhcos.json"
-	streamFCOSJSON             = "data/data/coreos/fcos.json"
 	streamSCOSJSON             = "data/data/coreos/scos.json"
 	streamMarketplaceRHCOSJSON = "data/data/coreos/marketplace-rhcos.json"
-	fcosTAG                    = "okd"
 	scosTAG                    = "scos"
 	dest                       = "bin/manifests/coreos-bootimages.yaml"
 )
@@ -78,9 +76,6 @@ func getBootImages() ([]byte, error) {
 	var streamJSON string
 	tags, _ := os.LookupEnv("TAGS")
 	switch {
-	case strings.Contains(tags, fcosTAG):
-		streamJSON = streamFCOSJSON
-		okd = true
 	case strings.Contains(tags, scosTAG):
 		streamJSON = streamSCOSJSON
 		okd = true
diff --git a/pkg/asset/ignition/bootstrap/common.go b/pkg/asset/ignition/bootstrap/common.go
@@ -89,7 +89,6 @@ type bootstrapTemplateData struct {
 	BootstrapInPlace      *types.BootstrapInPlace
 	UseIPv6ForNodeIP      bool
 	UseDualForNodeIP      bool
-	IsFCOS                bool
 	IsSCOS                bool
 	IsOKD                 bool
 	BootstrapNodeIP       string
@@ -391,7 +390,6 @@ func (a *Common) getTemplateData(dependencies asset.Parents, bootstrapInPlace bo
 		BootstrapInPlace:      bootstrapInPlaceConfig,
 		UseIPv6ForNodeIP:      ipv6Primary,
 		UseDualForNodeIP:      hasIPv4 && hasIPv6,
-		IsFCOS:                installConfig.Config.IsFCOS(),
 		IsSCOS:                installConfig.Config.IsSCOS(),
 		IsOKD:                 installConfig.Config.IsOKD(),
 		BootstrapNodeIP:       bootstrapNodeIP,
diff --git a/pkg/asset/manifests/operators.go b/pkg/asset/manifests/operators.go
@@ -171,7 +171,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()),
-		IsFCOS:                installConfig.Config.IsFCOS(),
 		IsSCOS:                installConfig.Config.IsSCOS(),
 		IsOKD:                 installConfig.Config.IsOKD(),
 	}
diff --git a/pkg/asset/manifests/template.go b/pkg/asset/manifests/template.go
@@ -78,7 +78,6 @@ type bootkubeTemplateData struct {
 	EtcdSignerClientCert       string
 	EtcdSignerClientKey        string
 	EtcdSignerKey              string
-	IsFCOS                     bool
 	IsSCOS                     bool
 	IsOKD                      bool
 	McsTLSCert                 string
diff --git a/pkg/infrastructure/vsphere/clusterapi/import.go b/pkg/infrastructure/vsphere/clusterapi/import.go
@@ -82,8 +82,8 @@ func importRhcosOva(ctx context.Context, session *session.Session, folder *objec
 		return fmt.Errorf("failed to parse ovf: %w", err)
 	}
 
-	// The fcos ova enables secure boot by default, this causes
-	// scos to fail once
+	// Some OVAs enable secure boot by default, this can cause
+	// issues with certain configurations
 	secureBoot := checkOvaSecureBoot(ovfEnvelope)
 
 	// The RHCOS OVA only has one network defined by default
diff --git a/pkg/rhcos/builds.go b/pkg/rhcos/builds.go
@@ -90,8 +90,7 @@ func FormatURLWithIntegrity(artifact *stream.Artifact) (string, error) {
 }
 
 // FindArtifactURL returns a single "disk" artifact type; this
-// mainly abstracts over e.g. `qcow2.xz` and `qcow2.gz`.  (FCOS uses
-// xz, RHCOS uses gzip right now)
+// mainly abstracts over different compression formats like `qcow2.xz` and `qcow2.gz`.
 //
 // Use this function only for cases where there's a single artifact type, such
 // as `qemu` and `openstack`.
diff --git a/pkg/rhcos/stream.go b/pkg/rhcos/stream.go
@@ -1,4 +1,4 @@
-//go:build !(okd || fcos || scos)
+//go:build !(okd || scos)
 
 package rhcos
 
diff --git a/pkg/rhcos/stream_fcos.go b/pkg/rhcos/stream_fcos.go
diff --git a/pkg/types/installconfig.go b/pkg/types/installconfig.go
@@ -56,8 +56,6 @@ var (
 		none.Name,
 	}
 
-	// FCOS is a setting to enable Fedora CoreOS-only modifications
-	FCOS = false
 	// SCOS is a setting to enable CentOS Stream CoreOS-only modifications
 	SCOS = false
 )
@@ -233,19 +231,14 @@ func (c *InstallConfig) ClusterDomain() string {
 	return fmt.Sprintf("%s.%s", c.ObjectMeta.Name, strings.TrimSuffix(c.BaseDomain, "."))
 }
 
-// IsFCOS returns true if Fedora CoreOS-only modifications are enabled
-func (c *InstallConfig) IsFCOS() bool {
-	return FCOS
-}
-
 // IsSCOS returns true if CentOs Stream CoreOS-only modifications are enabled
 func (c *InstallConfig) IsSCOS() bool {
 	return SCOS
 }
 
 // IsOKD returns true if community-only modifications are enabled
 func (c *InstallConfig) IsOKD() bool {
-	return c.IsFCOS() || c.IsSCOS()
+	return c.IsSCOS()
 }
 
 // IsSingleNodeOpenShift returns true if the install-config has been configured for
diff --git a/pkg/types/installconfig_fcos.go b/pkg/types/installconfig_fcos.go

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,6 @@ func (m Manifests) generateBootKubeManifests(dependencies asset.Parents) []ass`
`171`	`171`	`RootCaCert: string(rootCA.Cert()),`
`172`	`172`	`RootCACertBase64: base64.StdEncoding.EncodeToString(rootCA.Cert()),`
`173`	`173`	`RootCASignerKeyBase64: base64.StdEncoding.EncodeToString(rootCA.Key()),`
`174`		`- IsFCOS: installConfig.Config.IsFCOS(),`
`175`	`174`	`IsSCOS: installConfig.Config.IsSCOS(),`
`176`	`175`	`IsOKD: installConfig.Config.IsOKD(),`
`177`	`176`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,8 +82,8 @@ func importRhcosOva(ctx context.Context, session session.Session, folder objec`
`82`	`82`	`return fmt.Errorf("failed to parse ovf: %w", err)`
`83`	`83`	`}`
`84`	`84`
`85`		`- // The fcos ova enables secure boot by default, this causes`
`86`		`- // scos to fail once`
	`85`	`+ // Some OVAs enable secure boot by default, this can cause`
	`86`	`+ // issues with certain configurations`
`87`	`87`	`secureBoot := checkOvaSecureBoot(ovfEnvelope)`
`88`	`88`
`89`	`89`	`// The RHCOS OVA only has one network defined by default`
Original file line number	Diff line number	Diff line change
`@@ -90,8 +90,7 @@ func FormatURLWithIntegrity(artifact *stream.Artifact) (string, error) {`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`// FindArtifactURL returns a single "disk" artifact type; this`
`93`		-// mainly abstracts over e.g. `qcow2.xz` and `qcow2.gz`. (FCOS uses
`94`		`-// xz, RHCOS uses gzip right now)`
	`93`	+// mainly abstracts over different compression formats like `qcow2.xz` and `qcow2.gz`.
`95`	`94`	`//`
`96`	`95`	`// Use this function only for cases where there's a single artifact type, such`
`97`	`96`	// as `qemu` and `openstack`.
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//go:build !(okd \|\| fcos \|\| scos)`
	`1`	`+//go:build !(okd \|\| scos)`
`2`	`2`
`3`	`3`	`package rhcos`
`4`	`4`