From f6101bb75277ec0ea0090ba67a0ccc113e6bffa0 Mon Sep 17 00:00:00 2001 From: sarthakpurohit Date: Sat, 27 Sep 2025 04:34:27 +0530 Subject: [PATCH] Removed fcos references --- data/data/coreos/fcos.json | 820 ------------------ .../bootkube/cvo-overrides.yaml.template | 5 +- hack/build-coreos-manifest.go | 5 - pkg/asset/ignition/bootstrap/common.go | 2 - pkg/asset/manifests/operators.go | 1 - pkg/asset/manifests/template.go | 1 - .../vsphere/clusterapi/import.go | 4 +- pkg/rhcos/builds.go | 3 +- pkg/rhcos/stream.go | 2 +- pkg/rhcos/stream_fcos.go | 13 - pkg/types/installconfig.go | 9 +- pkg/types/installconfig_fcos.go | 7 - 12 files changed, 6 insertions(+), 866 deletions(-) delete mode 100644 data/data/coreos/fcos.json delete mode 100644 pkg/rhcos/stream_fcos.go delete mode 100644 pkg/types/installconfig_fcos.go diff --git a/data/data/coreos/fcos.json b/data/data/coreos/fcos.json deleted file mode 100644 index d45f5c5a97..0000000000 --- a/data/data/coreos/fcos.json +++ /dev/null @@ -1,820 +0,0 @@ -{ - "stream": "stable", - "metadata": { - "last-modified": "2023-11-20T23:53:07Z", - "generator": "fedora-coreos-stream-generator v0.2.14-1-g8ef5cb1" - }, - "architectures": { - "aarch64": { - "artifacts": { - "aws": { - "release": "39.20231101.3.0", - "formats": { - "vmdk.xz": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/aarch64/fedora-coreos-39.20231101.3.0-aws.aarch64.vmdk.xz", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/aarch64/fedora-coreos-39.20231101.3.0-aws.aarch64.vmdk.xz.sig", - "sha256": "e120984458956ec552caad4e6f1e93a8402a0394f3042fda1025d5bf4030baf2", - "uncompressed-sha256": "de2cf13bdac9213f39f6a62e2062c5c0f7cd0d53fa4b49ef5962c3e0b66644f1" - } - } - } - }, - "azure": { - "release": "39.20231101.3.0", - "formats": { - "vhd.xz": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/aarch64/fedora-coreos-39.20231101.3.0-azure.aarch64.vhd.xz", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/aarch64/fedora-coreos-39.20231101.3.0-azure.aarch64.vhd.xz.sig", - "sha256": "a68e4e92fd16e8c9e6d023af83eb3f6b9d0875d49e3f164dd42345755bdfd08b", - "uncompressed-sha256": "3c1502fe8950b14206a79a83e32336ed5bcfebf0f49c05214a032e313ee415cb" - } - } - } - }, - "gcp": { - "release": "39.20231101.3.0", - "formats": { - "tar.gz": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/aarch64/fedora-coreos-39.20231101.3.0-gcp.aarch64.tar.gz", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/aarch64/fedora-coreos-39.20231101.3.0-gcp.aarch64.tar.gz.sig", - "sha256": "521b8ac61386cb644993f85921012818eddfb8efdf42b305609b9a083d506257", - "uncompressed-sha256": "98dde99e091ee2981c1f0d05fa8c7ca49b35e762ad416ec4a5f1519349301c39" - } - } - } - }, - "hyperv": { - "release": "39.20231101.3.0", - "formats": { - "vhdx.zip": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/aarch64/fedora-coreos-39.20231101.3.0-hyperv.aarch64.vhdx.zip", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/aarch64/fedora-coreos-39.20231101.3.0-hyperv.aarch64.vhdx.zip.sig", - "sha256": "4b7c8f8217945dada9167d0b1825df577adeb40c330ddb869de5761eb3d305c1", - "uncompressed-sha256": "6d46b18ec0637412e0892f04b359750e788624a468d4179d4430de56a2d619a1" - } - } - } - }, - "metal": { - "release": "39.20231101.3.0", - "formats": { - "4k.raw.xz": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/aarch64/fedora-coreos-39.20231101.3.0-metal4k.aarch64.raw.xz", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/aarch64/fedora-coreos-39.20231101.3.0-metal4k.aarch64.raw.xz.sig", - "sha256": "25e84bde4cea038df2d635eb28c4f9ed43b3d781f9e2576ef2e78fffccb7607c", - "uncompressed-sha256": "4b6a62012dd9954cc83560024097b3a32af869d7facda2d3cc434a4ca051e72e" - } - }, - "iso": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/aarch64/fedora-coreos-39.20231101.3.0-live.aarch64.iso", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/aarch64/fedora-coreos-39.20231101.3.0-live.aarch64.iso.sig", - "sha256": "feaea60cbd0b9d41f5980b9257a673dc4c81526e50323647765db5cf892e6dce" - } - }, - "pxe": { - "kernel": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/aarch64/fedora-coreos-39.20231101.3.0-live-kernel-aarch64", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/aarch64/fedora-coreos-39.20231101.3.0-live-kernel-aarch64.sig", - "sha256": "20b774bf887c145886c0d71cc654b4eec91c0988345e97529056b1ea70bb1afa" - }, - "initramfs": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/aarch64/fedora-coreos-39.20231101.3.0-live-initramfs.aarch64.img", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/aarch64/fedora-coreos-39.20231101.3.0-live-initramfs.aarch64.img.sig", - "sha256": "15244cf473cc5ea0d22d32dbe70f38ff50231caba079907234c9bbfb5dcaf08e" - }, - "rootfs": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/aarch64/fedora-coreos-39.20231101.3.0-live-rootfs.aarch64.img", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/aarch64/fedora-coreos-39.20231101.3.0-live-rootfs.aarch64.img.sig", - "sha256": "04b9820ac47ed7377805f78b083a52b593ac29de82187d221649581fcf2562b2" - } - }, - "raw.xz": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/aarch64/fedora-coreos-39.20231101.3.0-metal.aarch64.raw.xz", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/aarch64/fedora-coreos-39.20231101.3.0-metal.aarch64.raw.xz.sig", - "sha256": "bd3f851c39f175c0f86325502bbd60413f616aafb04e4088adc93be6600b03dc", - "uncompressed-sha256": "8d1f3c7172b2890e3ccf197494a3c6e2edbfde4693c44aa41f15032b7ecc4787" - } - } - } - }, - "openstack": { - "release": "39.20231101.3.0", - "formats": { - "qcow2.xz": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/aarch64/fedora-coreos-39.20231101.3.0-openstack.aarch64.qcow2.xz", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/aarch64/fedora-coreos-39.20231101.3.0-openstack.aarch64.qcow2.xz.sig", - "sha256": "a294b02887956a6218e90208cbd88b30ea986a5d1ddd9cbccffa64837da9934a", - "uncompressed-sha256": "49e3f90f01704c7c37df90486f9496fa8675a7dd77424ff3d57e6244edc7e2d0" - } - } - } - }, - "qemu": { - "release": "39.20231101.3.0", - "formats": { - "qcow2.xz": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/aarch64/fedora-coreos-39.20231101.3.0-qemu.aarch64.qcow2.xz", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/aarch64/fedora-coreos-39.20231101.3.0-qemu.aarch64.qcow2.xz.sig", - "sha256": "09fa17bdab3908a5d0d368ba21723b064da9e8060b33cd1535f35bbc38b62217", - "uncompressed-sha256": "07867d3b868a0cf116caab8cb73f7872106371adf9cd6395bad9c60481071e55" - } - } - } - } - }, - "images": { - "aws": { - "regions": { - "af-south-1": { - "release": "39.20231101.3.0", - "image": "ami-045772f1fa0d4df64" - }, - "ap-east-1": { - "release": "39.20231101.3.0", - "image": "ami-01753613c3c9d6d86" - }, - "ap-northeast-1": { - "release": "39.20231101.3.0", - "image": "ami-05942596976488534" - }, - "ap-northeast-2": { - "release": "39.20231101.3.0", - "image": "ami-0d2e899263181c091" - }, - "ap-northeast-3": { - "release": "39.20231101.3.0", - "image": "ami-03c9f1dee14c27efa" - }, - "ap-south-1": { - "release": "39.20231101.3.0", - "image": "ami-0342287d152843bc8" - }, - "ap-south-2": { - "release": "39.20231101.3.0", - "image": "ami-00a19b4321e9709b5" - }, - "ap-southeast-1": { - "release": "39.20231101.3.0", - "image": "ami-01d63db230eef29bb" - }, - "ap-southeast-2": { - "release": "39.20231101.3.0", - "image": "ami-0607661d09e32895a" - }, - "ap-southeast-3": { - "release": "39.20231101.3.0", - "image": "ami-091948b5fac6328b0" - }, - "ap-southeast-4": { - "release": "39.20231101.3.0", - "image": "ami-03fbb1faaa68b39d2" - }, - "ca-central-1": { - "release": "39.20231101.3.0", - "image": "ami-0e0a21469a0c6ef84" - }, - "eu-central-1": { - "release": "39.20231101.3.0", - "image": "ami-0808e4ba2caae3372" - }, - "eu-central-2": { - "release": "39.20231101.3.0", - "image": "ami-0be1dcdfa2f389fb9" - }, - "eu-north-1": { - "release": "39.20231101.3.0", - "image": "ami-00ebc46cc16bde64c" - }, - "eu-south-1": { - "release": "39.20231101.3.0", - "image": "ami-01e825d7d129c2ce2" - }, - "eu-south-2": { - "release": "39.20231101.3.0", - "image": "ami-02f3a2489211edc94" - }, - "eu-west-1": { - "release": "39.20231101.3.0", - "image": "ami-0faaccea4bbe03bc1" - }, - "eu-west-2": { - "release": "39.20231101.3.0", - "image": "ami-0e19a32d7ce40282a" - }, - "eu-west-3": { - "release": "39.20231101.3.0", - "image": "ami-09e81b79f53473ec7" - }, - "il-central-1": { - "release": "39.20231101.3.0", - "image": "ami-03d724602578d39eb" - }, - "me-central-1": { - "release": "39.20231101.3.0", - "image": "ami-06325d650391a3919" - }, - "me-south-1": { - "release": "39.20231101.3.0", - "image": "ami-090606dff6042991d" - }, - "sa-east-1": { - "release": "39.20231101.3.0", - "image": "ami-052a974161b366d68" - }, - "us-east-1": { - "release": "39.20231101.3.0", - "image": "ami-0255583b265f03a55" - }, - "us-east-2": { - "release": "39.20231101.3.0", - "image": "ami-02295f483608eb92e" - }, - "us-west-1": { - "release": "39.20231101.3.0", - "image": "ami-08535407836d1de27" - }, - "us-west-2": { - "release": "39.20231101.3.0", - "image": "ami-0d2de5c012e1c150e" - } - } - }, - "gcp": { - "release": "39.20231101.3.0", - "project": "fedora-coreos-cloud", - "family": "fedora-coreos-stable-arm64", - "name": "fedora-coreos-39-20231101-3-0-gcp-aarch64" - } - } - }, - "ppc64le": { - "artifacts": { - "metal": { - "release": "39.20231101.3.0", - "formats": { - "4k.raw.xz": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/ppc64le/fedora-coreos-39.20231101.3.0-metal4k.ppc64le.raw.xz", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/ppc64le/fedora-coreos-39.20231101.3.0-metal4k.ppc64le.raw.xz.sig", - "sha256": "055d8d39e8d47872b845814dd588136d8928a626e7071f3aed5f98ba3c5ecd39", - "uncompressed-sha256": "bf49b3e31750adf869a0ac2d9055251ca640d61b8e711cd2acdf9ec35a0f35e0" - } - }, - "iso": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/ppc64le/fedora-coreos-39.20231101.3.0-live.ppc64le.iso", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/ppc64le/fedora-coreos-39.20231101.3.0-live.ppc64le.iso.sig", - "sha256": "2cba41d00cd6516bd68463e6dc78e56c31d99ec0b23162fceab9afd0c8a5a1d7" - } - }, - "pxe": { - "kernel": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/ppc64le/fedora-coreos-39.20231101.3.0-live-kernel-ppc64le", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/ppc64le/fedora-coreos-39.20231101.3.0-live-kernel-ppc64le.sig", - "sha256": "5dac3a5d65e5b411f4fef6848232a8faf8fcca3f32021e28b56faa92f4707bd3" - }, - "initramfs": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/ppc64le/fedora-coreos-39.20231101.3.0-live-initramfs.ppc64le.img", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/ppc64le/fedora-coreos-39.20231101.3.0-live-initramfs.ppc64le.img.sig", - "sha256": "a08d34dc4c71e3021e689c9f3909091156e1300aab640d5c6b8690a0eb1b0a4a" - }, - "rootfs": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/ppc64le/fedora-coreos-39.20231101.3.0-live-rootfs.ppc64le.img", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/ppc64le/fedora-coreos-39.20231101.3.0-live-rootfs.ppc64le.img.sig", - "sha256": "83645862a886cd5965d4ba5b7dcfe2526218a82f016e0b534138d2a029a53199" - } - }, - "raw.xz": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/ppc64le/fedora-coreos-39.20231101.3.0-metal.ppc64le.raw.xz", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/ppc64le/fedora-coreos-39.20231101.3.0-metal.ppc64le.raw.xz.sig", - "sha256": "ed683f90dcd709e65065fabd8fef32ccb696c693908465e711819e5b3d1ea1db", - "uncompressed-sha256": "fe629bb58481e8d83f72cfe48151a0f1b1ea55d9129d0a4510eaf2ef42f2962b" - } - } - } - }, - "openstack": { - "release": "39.20231101.3.0", - "formats": { - "qcow2.xz": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/ppc64le/fedora-coreos-39.20231101.3.0-openstack.ppc64le.qcow2.xz", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/ppc64le/fedora-coreos-39.20231101.3.0-openstack.ppc64le.qcow2.xz.sig", - "sha256": "db5a1979e1e378c101c5062d36d2128633f836c1dbffec221647daab04a9dbad", - "uncompressed-sha256": "eb4c3ee8aac26c90d69460629c518558f7bb2d00cb63498a10f7ecb00e1307cc" - } - } - } - }, - "powervs": { - "release": "39.20231101.3.0", - "formats": { - "ova.gz": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/ppc64le/fedora-coreos-39.20231101.3.0-powervs.ppc64le.ova.gz", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/ppc64le/fedora-coreos-39.20231101.3.0-powervs.ppc64le.ova.gz.sig", - "sha256": "db6eeed5a323702a2486d3402d3d0e80fe4c0030ec8479dd17f8c1b772883054", - "uncompressed-sha256": "5e8cdb964ced883da1fe01a78788f498a19fb0faace6b00039eb4fbe7131432c" - } - } - } - }, - "qemu": { - "release": "39.20231101.3.0", - "formats": { - "qcow2.xz": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/ppc64le/fedora-coreos-39.20231101.3.0-qemu.ppc64le.qcow2.xz", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/ppc64le/fedora-coreos-39.20231101.3.0-qemu.ppc64le.qcow2.xz.sig", - "sha256": "bb9a5acab44e9f5a85da4306eb2d731d00dd4e1da717342e437a179927b6a36e", - "uncompressed-sha256": "2dc062c875f8c9a12985307af7801a50a7283e2e0012e13074702a9dd8fe426a" - } - } - } - } - }, - "images": {} - }, - "s390x": { - "artifacts": { - "ibmcloud": { - "release": "39.20231101.3.0", - "formats": { - "qcow2.xz": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/s390x/fedora-coreos-39.20231101.3.0-ibmcloud.s390x.qcow2.xz", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/s390x/fedora-coreos-39.20231101.3.0-ibmcloud.s390x.qcow2.xz.sig", - "sha256": "6bd1bc9dfdb08056e56d0668a84244d3e545fe394dcc42a45e8b8bf8b9160064", - "uncompressed-sha256": "ffb8b58024a5814fa366c8dba0c7a24492babe1448d9b7ed2105985ac133b776" - } - } - } - }, - "metal": { - "release": "39.20231101.3.0", - "formats": { - "4k.raw.xz": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/s390x/fedora-coreos-39.20231101.3.0-metal4k.s390x.raw.xz", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/s390x/fedora-coreos-39.20231101.3.0-metal4k.s390x.raw.xz.sig", - "sha256": "a6c47ece6ee74e94f839277916e15271975760fb38db02f50c34848a890e7bd5", - "uncompressed-sha256": "ad5a703c36326bbbfeb99311a452eed93682966f73fe21044ee45dc446cbb58d" - } - }, - "iso": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/s390x/fedora-coreos-39.20231101.3.0-live.s390x.iso", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/s390x/fedora-coreos-39.20231101.3.0-live.s390x.iso.sig", - "sha256": "b6cf50eb99acf060586ebaa84d0cfc935a05e38af4b29512ce965b5f09152136" - } - }, - "pxe": { - "kernel": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/s390x/fedora-coreos-39.20231101.3.0-live-kernel-s390x", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/s390x/fedora-coreos-39.20231101.3.0-live-kernel-s390x.sig", - "sha256": "0878d7993a034ec80caefec6fb8204181c298ebe000eee4b25b4be8021696b9c" - }, - "initramfs": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/s390x/fedora-coreos-39.20231101.3.0-live-initramfs.s390x.img", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/s390x/fedora-coreos-39.20231101.3.0-live-initramfs.s390x.img.sig", - "sha256": "5b496f7991a91e7af715f1d87d75f1736c24f2069a02e7b668bd7f952d896bcf" - }, - "rootfs": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/s390x/fedora-coreos-39.20231101.3.0-live-rootfs.s390x.img", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/s390x/fedora-coreos-39.20231101.3.0-live-rootfs.s390x.img.sig", - "sha256": "7e902dbdeca615768f9927882e0aee361a178976fb3b0cd369d069bc7275fb45" - } - }, - "raw.xz": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/s390x/fedora-coreos-39.20231101.3.0-metal.s390x.raw.xz", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/s390x/fedora-coreos-39.20231101.3.0-metal.s390x.raw.xz.sig", - "sha256": "9ba854a282a4e13947550d5914e499a080e9dd40745267ce2a8f02bdac006102", - "uncompressed-sha256": "90b7c147a2cd858b2f20504a61e9df262686eb078e9b6adb69044caee03c2180" - } - } - } - }, - "openstack": { - "release": "39.20231101.3.0", - "formats": { - "qcow2.xz": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/s390x/fedora-coreos-39.20231101.3.0-openstack.s390x.qcow2.xz", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/s390x/fedora-coreos-39.20231101.3.0-openstack.s390x.qcow2.xz.sig", - "sha256": "da6774968ca8ad39f9635dc89d75b48006aa4aa370fb03ef3c8920fdf2442ee5", - "uncompressed-sha256": "7e2212947c838014f8138360cddfa7b7bfec710dbc035d62c0572f6c24416e07" - } - } - } - }, - "qemu": { - "release": "39.20231101.3.0", - "formats": { - "qcow2.xz": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/s390x/fedora-coreos-39.20231101.3.0-qemu.s390x.qcow2.xz", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/s390x/fedora-coreos-39.20231101.3.0-qemu.s390x.qcow2.xz.sig", - "sha256": "f15c477d1d7999879646e5738db3886b90a8f05eb5c28e83992c02cdfe297aaa", - "uncompressed-sha256": "39af1a9e6845272592bac2ed7021fc24b57c0eac3277984c75c4dd0e86feba14" - } - } - } - } - }, - "images": {} - }, - "x86_64": { - "artifacts": { - "aliyun": { - "release": "39.20231101.3.0", - "formats": { - "qcow2.xz": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-aliyun.x86_64.qcow2.xz", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-aliyun.x86_64.qcow2.xz.sig", - "sha256": "2fd4ebb5b726400258393626df11ccc33a74214339b3c613b1fb5f004e19e63a", - "uncompressed-sha256": "3e2914c57179806213aff1d776ab70c31368768740275ff0318643909e84899c" - } - } - } - }, - "aws": { - "release": "39.20231101.3.0", - "formats": { - "vmdk.xz": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-aws.x86_64.vmdk.xz", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-aws.x86_64.vmdk.xz.sig", - "sha256": "ba56658b56ac23b4b1dd092cee4994ed53996c8e63e40410e19e31b99ecb2eca", - "uncompressed-sha256": "5b9b89847a23ecf72409cff1d3631d0054ff25f2af814e38194c8f62852019a4" - } - } - } - }, - "azure": { - "release": "39.20231101.3.0", - "formats": { - "vhd.xz": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-azure.x86_64.vhd.xz", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-azure.x86_64.vhd.xz.sig", - "sha256": "6cf549dfc880a3a6a7b25a6ee274c120d6fba0e0c983050f1bd1baec299a35da", - "uncompressed-sha256": "ad413cdf6f19db657910f66714f5b06314676fc7e1c8d3ba8431d51c875d14c9" - } - } - } - }, - "azurestack": { - "release": "39.20231101.3.0", - "formats": { - "vhd.xz": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-azurestack.x86_64.vhd.xz", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-azurestack.x86_64.vhd.xz.sig", - "sha256": "6d0b854648b02ed1fcda4ba1eda2192ed9d5f44ed728daeba8999d59cd81fea3", - "uncompressed-sha256": "b98ede6130c5ecf4f3c3c473832804bb3f2583ad4bbb81e69442a160ebc437e9" - } - } - } - }, - "digitalocean": { - "release": "39.20231101.3.0", - "formats": { - "qcow2.gz": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-digitalocean.x86_64.qcow2.gz", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-digitalocean.x86_64.qcow2.gz.sig", - "sha256": "fb07ccf5d1f34a0368fb621370a5512fa4f6cfdd682b049c5c7d9d6c664957db", - "uncompressed-sha256": "a09b30a4efd8246676594d082882d2b87866c176f9614b8537d7b40ae7401bb4" - } - } - } - }, - "exoscale": { - "release": "39.20231101.3.0", - "formats": { - "qcow2.xz": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-exoscale.x86_64.qcow2.xz", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-exoscale.x86_64.qcow2.xz.sig", - "sha256": "ae579db54b095ca8481cc32b01ccde4d25e5d66a0bab2161cda14c26b00a3ba7", - "uncompressed-sha256": "08abdf5f0fe073d652f486c768f4865fb0b69a056b6a25ec365f412428356755" - } - } - } - }, - "gcp": { - "release": "39.20231101.3.0", - "formats": { - "tar.gz": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-gcp.x86_64.tar.gz", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-gcp.x86_64.tar.gz.sig", - "sha256": "2529209b72af7126f6c2860697f96b2626ef5db4faf0bee6509dce0c295e9b93", - "uncompressed-sha256": "d685e558322d5984e19e34d41b7009a705c7b27cabf0a9276f9ecbe987df50e2" - } - } - } - }, - "hyperv": { - "release": "39.20231101.3.0", - "formats": { - "vhdx.zip": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-hyperv.x86_64.vhdx.zip", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-hyperv.x86_64.vhdx.zip.sig", - "sha256": "6aec1fafb185386ee650121c9fae47b9a1f2fbc7e689f7e89d4e9a1ce26a54cc", - "uncompressed-sha256": "31ee4f582496bb211b742546a8c674138afda3425d3106b6dd45d16ec67751fd" - } - } - } - }, - "ibmcloud": { - "release": "39.20231101.3.0", - "formats": { - "qcow2.xz": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-ibmcloud.x86_64.qcow2.xz", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-ibmcloud.x86_64.qcow2.xz.sig", - "sha256": "606d2f2ec3067b10d6aa5f3b6cea4d0dd7b1951d973923de5fa51dee6c6bb0e2", - "uncompressed-sha256": "a2654abde46f6f6dee602776efc67beb0c646b9a90ef334b44be2140d7280a1c" - } - } - } - }, - "kubevirt": { - "release": "39.20231101.3.0", - "formats": { - "ociarchive": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-kubevirt.x86_64.ociarchive", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-kubevirt.x86_64.ociarchive.sig", - "sha256": "d076cab8f6b74454e522655f444a2e08cc0649b1874e9bbd769900dda7de8282" - } - } - } - }, - "metal": { - "release": "39.20231101.3.0", - "formats": { - "4k.raw.xz": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-metal4k.x86_64.raw.xz", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-metal4k.x86_64.raw.xz.sig", - "sha256": "b289537c83f56354c278f93ab9a9fb3b8a5912d688966d5b75c1fe9982274cd1", - "uncompressed-sha256": "dba43eb0578fcb35aa23ba641d6c78d09727bf41339dab09aaf0373ade465368" - } - }, - "iso": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-live.x86_64.iso", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-live.x86_64.iso.sig", - "sha256": "0b09997ca0170a2d8634b5942c9437a18b6d354b020c7e24aa9fe41f1458f33e" - } - }, - "pxe": { - "kernel": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-live-kernel-x86_64", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-live-kernel-x86_64.sig", - "sha256": "341f068fb4ad4c6ce1b9a822edab58123c533c73f3bafc8951e4463c3c6f27cf" - }, - "initramfs": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-live-initramfs.x86_64.img", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-live-initramfs.x86_64.img.sig", - "sha256": "9563bc05a8d078640a587ebb6f13b97ba4d40286ec420f41721158867512e257" - }, - "rootfs": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-live-rootfs.x86_64.img", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-live-rootfs.x86_64.img.sig", - "sha256": "0c0fd3c27db3768a6dc28ef7f8c4b96242ddc4c76f19462b0ab1b09989b0b6d3" - } - }, - "raw.xz": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-metal.x86_64.raw.xz", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-metal.x86_64.raw.xz.sig", - "sha256": "319b68705149bebe6a4af16c08a91675383c4222980e204541b3834b40dcc0ed", - "uncompressed-sha256": "8f34363844df85465bbb0f89441cc0db0d89a80a17b12df0195e0923c1acb89c" - } - } - } - }, - "nutanix": { - "release": "39.20231101.3.0", - "formats": { - "qcow2": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-nutanix.x86_64.qcow2", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-nutanix.x86_64.qcow2.sig", - "sha256": "93c4c904944d23eb1688230fe5ce6e692ff5f2ece1055566f7a131212fd57dbb" - } - } - } - }, - "openstack": { - "release": "39.20231101.3.0", - "formats": { - "qcow2.xz": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-openstack.x86_64.qcow2.xz", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-openstack.x86_64.qcow2.xz.sig", - "sha256": "9abbd308c9571604d231660510a5512a7bf1cdf457914c68e53bf4484d670308", - "uncompressed-sha256": "0d988863e9b8561e6bc647abe93e5db6276dde8b10c59662603832ed7700049f" - } - } - } - }, - "qemu": { - "release": "39.20231101.3.0", - "formats": { - "qcow2.xz": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-qemu.x86_64.qcow2.xz", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-qemu.x86_64.qcow2.xz.sig", - "sha256": "f3b209efb6ea9fe9b8bbfe1c1d4cafc0046ae7aa62bf6b63189494ee90155b81", - "uncompressed-sha256": "924811866346c35fa32ee8012be4d6c73b2428ac09a43dbcbba4b4dcd660f914" - } - } - } - }, - "virtualbox": { - "release": "39.20231101.3.0", - "formats": { - "ova": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-virtualbox.x86_64.ova", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-virtualbox.x86_64.ova.sig", - "sha256": "57b2acdfe0666a63f7b7222ec46d8302117f4d964fe78714b5abb430b5d32408" - } - } - } - }, - "vmware": { - "release": "39.20231101.3.0", - "formats": { - "ova": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-vmware.x86_64.ova", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-vmware.x86_64.ova.sig", - "sha256": "e7637603e78f1569ff4f1461c6e209e8d2b6ed063c08f222f662e9afb2bc4742" - } - } - } - }, - "vultr": { - "release": "39.20231101.3.0", - "formats": { - "raw.xz": { - "disk": { - "location": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-vultr.x86_64.raw.xz", - "signature": "https://builds.coreos.fedoraproject.org/prod/streams/stable/builds/39.20231101.3.0/x86_64/fedora-coreos-39.20231101.3.0-vultr.x86_64.raw.xz.sig", - "sha256": "64725113b9c2c613d62b7af8676647cb989ecf62c6ba5a06378f196a397d4b18", - "uncompressed-sha256": "97329f1c485a7cf293d3803efdf7653cf48e08a54e844d40e573e960a48a8599" - } - } - } - } - }, - "images": { - "aws": { - "regions": { - "af-south-1": { - "release": "39.20231101.3.0", - "image": "ami-0d6a194196909601b" - }, - "ap-east-1": { - "release": "39.20231101.3.0", - "image": "ami-0b4b027c5422b421a" - }, - "ap-northeast-1": { - "release": "39.20231101.3.0", - "image": "ami-035653912ad9f4827" - }, - "ap-northeast-2": { - "release": "39.20231101.3.0", - "image": "ami-0e0a64c8b5d1bcd09" - }, - "ap-northeast-3": { - "release": "39.20231101.3.0", - "image": "ami-0c89124f095cfc624" - }, - "ap-south-1": { - "release": "39.20231101.3.0", - "image": "ami-0e8204659c7ae181e" - }, - "ap-south-2": { - "release": "39.20231101.3.0", - "image": "ami-0f778b0f04e6cd8ca" - }, - "ap-southeast-1": { - "release": "39.20231101.3.0", - "image": "ami-0b65d55ae62e97d1b" - }, - "ap-southeast-2": { - "release": "39.20231101.3.0", - "image": "ami-0643a4f5ce30b3077" - }, - "ap-southeast-3": { - "release": "39.20231101.3.0", - "image": "ami-04fcf971286201341" - }, - "ap-southeast-4": { - "release": "39.20231101.3.0", - "image": "ami-05528ffc195388509" - }, - "ca-central-1": { - "release": "39.20231101.3.0", - "image": "ami-085f7cebe9630888e" - }, - "eu-central-1": { - "release": "39.20231101.3.0", - "image": "ami-05d5863b17761d25f" - }, - "eu-central-2": { - "release": "39.20231101.3.0", - "image": "ami-055be21ed167fe4b0" - }, - "eu-north-1": { - "release": "39.20231101.3.0", - "image": "ami-0ef1f4f99198436f5" - }, - "eu-south-1": { - "release": "39.20231101.3.0", - "image": "ami-039247f2ef73521aa" - }, - "eu-south-2": { - "release": "39.20231101.3.0", - "image": "ami-00149bf7330207b2d" - }, - "eu-west-1": { - "release": "39.20231101.3.0", - "image": "ami-0f43255f3f471957f" - }, - "eu-west-2": { - "release": "39.20231101.3.0", - "image": "ami-06f099d4671234f93" - }, - "eu-west-3": { - "release": "39.20231101.3.0", - "image": "ami-06edd11c7c3573601" - }, - "il-central-1": { - "release": "39.20231101.3.0", - "image": "ami-0d1e697f147485e05" - }, - "me-central-1": { - "release": "39.20231101.3.0", - "image": "ami-027abbf0e37753e7c" - }, - "me-south-1": { - "release": "39.20231101.3.0", - "image": "ami-0889f54acc52f4458" - }, - "sa-east-1": { - "release": "39.20231101.3.0", - "image": "ami-0bf368f7c80e4701d" - }, - "us-east-1": { - "release": "39.20231101.3.0", - "image": "ami-064a1e6e200a99d7a" - }, - "us-east-2": { - "release": "39.20231101.3.0", - "image": "ami-0c1c2ef7c2e336126" - }, - "us-west-1": { - "release": "39.20231101.3.0", - "image": "ami-0c0e39d4137de7774" - }, - "us-west-2": { - "release": "39.20231101.3.0", - "image": "ami-0f2d4c6c0cb3d9f12" - } - } - }, - "gcp": { - "release": "39.20231101.3.0", - "project": "fedora-coreos-cloud", - "family": "fedora-coreos-stable", - "name": "fedora-coreos-39-20231101-3-0-gcp-x86-64" - }, - "kubevirt": { - "release": "39.20231101.3.0", - "image": "quay.io/fedora/fedora-coreos-kubevirt:stable", - "digest-ref": "quay.io/fedora/fedora-coreos-kubevirt@sha256:b4ca0883a794870a033c03c64982383e06482948248f6e36f753998e3b165027" - } - } - } - } -} diff --git a/data/data/manifests/bootkube/cvo-overrides.yaml.template b/data/data/manifests/bootkube/cvo-overrides.yaml.template index 5751f6f04b..183e001a35 100644 --- 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 index 6411144b42..f81952d92c 100644 --- 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 index 832e6c7a0f..f5b7b667d3 100644 --- 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 index 1d983763b1..3fced8d864 100644 --- 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 index 16dfaebd41..51179f1a7c 100644 --- 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 index ccdeb16837..3e34e40f65 100644 --- 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 index 6169b763a4..395ad8fecd 100644 --- 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 index f4c62bab6d..8326382bfb 100644 --- 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 deleted file mode 100644 index 37bf6250dd..0000000000 --- a/pkg/rhcos/stream_fcos.go +++ /dev/null @@ -1,13 +0,0 @@ -//go:build okd || fcos - -package rhcos - -func getStreamFileName() string { - return "coreos/fcos.json" -} - -func getMarketplaceStreamFileName() string { - // There is no need for OKD marketplace images at this time - // so we can skip reading a marketplace stream file. - return "" -} diff --git a/pkg/types/installconfig.go b/pkg/types/installconfig.go index 6ed13abad8..03efc4bede 100644 --- 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 ) @@ -232,11 +230,6 @@ 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 @@ -244,7 +237,7 @@ func (c *InstallConfig) IsSCOS() bool { // 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 deleted file mode 100644 index d7ea2179be..0000000000 --- a/pkg/types/installconfig_fcos.go +++ /dev/null @@ -1,7 +0,0 @@ -//go:build okd || fcos - -package types - -func init() { - FCOS = true -}