From ca708b11a97335b9bb6d519e348c8a0ee872dff3 Mon Sep 17 00:00:00 2001 From: Lee Yarwood Date: Tue, 2 Jul 2024 13:12:35 +0100 Subject: [PATCH] centos: Remove centos artifact entirely with EOL https://blog.centos.org/2023/04/end-dates-are-coming-for-centos-stream-8-and-centos-linux-7/ Signed-off-by: Lee Yarwood --- README.md | 1 - artifacts/centos/centos.go | 128 --------------- artifacts/centos/centos_test.go | 77 ---------- artifacts/centos/testdata/centos7.checksum | 171 --------------------- cmd/medius/common/registry.go | 7 - 5 files changed, 384 deletions(-) delete mode 100644 artifacts/centos/centos.go delete mode 100644 artifacts/centos/centos_test.go delete mode 100644 artifacts/centos/testdata/centos7.checksum diff --git a/README.md b/README.md index 339ea0f1..8dca0ca0 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,6 @@ |------------------|---------------| | [CentOS Stream](https://quay.io/repository/containerdisks/centos-stream) | amd64, arm64 | | [Fedora](https://quay.io/repository/containerdisks/fedora) | amd64, arm64 | -| [CentOS](https://quay.io/repository/containerdisks/centos) | amd64 | | [Ubuntu](https://quay.io/repository/containerdisks/ubuntu) | amd64, arm64 | | [OpenSUSE Tumbleweed](https://quay.io/repository/containerdisks/opensuse-tumbleweed)| amd64 | | [OpenSUSE Leap](https://quay.io/repository/containerdisks/opensuse-leap) | amd64, arm64 | diff --git a/artifacts/centos/centos.go b/artifacts/centos/centos.go deleted file mode 100644 index 17f10ecb..00000000 --- a/artifacts/centos/centos.go +++ /dev/null @@ -1,128 +0,0 @@ -package centos - -import ( - "bytes" - "fmt" - "sort" - "strings" - - v1 "kubevirt.io/api/core/v1" - - "kubevirt.io/containerdisks/pkg/api" - "kubevirt.io/containerdisks/pkg/docs" - "kubevirt.io/containerdisks/pkg/hashsum" - "kubevirt.io/containerdisks/pkg/http" - "kubevirt.io/containerdisks/pkg/tests" -) - -//nolint:lll -const description = `drawing Centos Generic Cloud images for KubeVirt. -
-
-Visit [centos.org](https://www.centos.org/) to learn more about the CentOS project.` - -type centos struct { - Version string - Variant string - getter http.Getter - Arch string - EnvVariables map[string]string -} - -func (c *centos) Metadata() *api.Metadata { - return &api.Metadata{ - Name: "centos", - Version: c.Version, - Description: description, - ExampleUserData: docs.UserData{ - Username: "centos", - }, - EnvVariables: c.EnvVariables, - } -} - -func (c *centos) Inspect() (*api.ArtifactDetails, error) { - baseURL, checksumURL, checksumFormat := getURLsAndChecksumFormat(c.Version) - - raw, err := c.getter.GetAll(checksumURL) - if err != nil { - return nil, fmt.Errorf("error downloading the centos checksum file: %v", err) - } - checksums, err := hashsum.Parse(bytes.NewReader(raw), checksumFormat) - if err != nil { - return nil, fmt.Errorf("error reading the centos checksum file: %v", err) - } - - candidates := getCandidates(c.Version, c.Variant, checksums) - if len(candidates) == 0 { - return nil, fmt.Errorf("no candidates for version %q and variant %q found", c.Version, c.Variant) - } - - candidate := candidates[len(candidates)-1] - if checksum, exists := checksums[candidate]; exists { - return &api.ArtifactDetails{ - SHA256Sum: checksum, - DownloadURL: baseURL + candidate, - ImageArchitecture: "amd64", - }, nil - } - - return nil, fmt.Errorf("file %q does not exist in the sha256sum file: %v", c.Variant, err) -} - -func getURLsAndChecksumFormat(version string) (baseURL, checksumURL string, checksumFormat hashsum.ChecksumFormat) { - switch { - case strings.HasPrefix(version, "7-"): - baseURL = "https://cloud.centos.org/centos/7/images/" - checksumURL = baseURL + "sha256sum.txt" - checksumFormat = hashsum.ChecksumFormatGNU - default: - panic(fmt.Sprintf("can't understand provided version: %q", version)) - } - return -} - -func getCandidates(version, variant string, checksums map[string]string) (candidates []string) { - if strings.HasPrefix(version, "7-") { - components := strings.Split(version, "-") - for fileName := range checksums { - if strings.HasPrefix(fileName, fmt.Sprintf("CentOS-7-x86_64-%s-%s.qcow2", variant, components[1])) && - strings.HasSuffix(fileName, "qcow2") { - candidates = append(candidates, fileName) - } - } - } - sort.Strings(candidates) - return -} - -func (c *centos) VM(name, imgRef, userData string) *v1.VirtualMachine { - return docs.NewVM( - name, - imgRef, - docs.WithRng(), - docs.WithCloudInitNoCloud(userData), - ) -} - -func (c *centos) UserData(data *docs.UserData) string { - return docs.CloudInit(data) -} - -func (c *centos) Tests() []api.ArtifactTest { - return []api.ArtifactTest{ - tests.GuestOsInfo, - tests.SSH, - } -} - -// New accepts CentOS 7 and 8 versions. Example patterns are 7-2111, 7-2009, 8.3, 8.4, ... -func New(release string, envVariables map[string]string) *centos { - return ¢os{ - Version: release, - Variant: "GenericCloud", - Arch: "x86_64", - getter: &http.HTTPGetter{}, - EnvVariables: envVariables, - } -} diff --git a/artifacts/centos/centos_test.go b/artifacts/centos/centos_test.go deleted file mode 100644 index f351c65f..00000000 --- a/artifacts/centos/centos_test.go +++ /dev/null @@ -1,77 +0,0 @@ -package centos - -import ( - "testing" - - . "github.com/onsi/ginkgo/v2" - . "github.com/onsi/gomega" - - "kubevirt.io/containerdisks/pkg/api" - "kubevirt.io/containerdisks/pkg/common" - "kubevirt.io/containerdisks/pkg/docs" - "kubevirt.io/containerdisks/testutil" -) - -var _ = Describe("Centos", func() { - DescribeTable("Inspect should be able to parse checksum files", - func(release, mockFile string, details *api.ArtifactDetails, envVariables map[string]string, metadata *api.Metadata) { - c := New(release, envVariables) - c.getter = testutil.NewMockGetter(mockFile) - got, err := c.Inspect() - Expect(err).NotTo(HaveOccurred()) - Expect(got).To(Equal(details)) - Expect(c.Metadata()).To(Equal(metadata)) - }, - Entry("centos:7-2009", "7-2009", "testdata/centos7.checksum", - &api.ArtifactDetails{ - SHA256Sum: "e38bab0475cc6d004d2e17015969c659e5a308111851b0e2715e84646035bdd3", - DownloadURL: "https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-2009.qcow2", - ImageArchitecture: "amd64", - }, - map[string]string{ - common.DefaultInstancetypeEnv: "u1.medium", - common.DefaultPreferenceEnv: "centos.7", - }, - &api.Metadata{ - Name: "centos", - Version: "7-2009", - Description: description, - ExampleUserData: docs.UserData{ - Username: "centos", - }, - EnvVariables: map[string]string{ - common.DefaultInstancetypeEnv: "u1.medium", - common.DefaultPreferenceEnv: "centos.7", - }, - }, - ), - Entry("centos:7-1809", "7-1809", "testdata/centos7.checksum", - &api.ArtifactDetails{ - SHA256Sum: "42c062df8a8c36991ec0282009dd52ac488461a3f7ee114fc21a765bfc2671c2", - DownloadURL: "https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1809.qcow2", - ImageArchitecture: "amd64", - }, - map[string]string{ - common.DefaultInstancetypeEnv: "u1.medium", - common.DefaultPreferenceEnv: "centos.7", - }, - &api.Metadata{ - Name: "centos", - Version: "7-1809", - Description: description, - ExampleUserData: docs.UserData{ - Username: "centos", - }, - EnvVariables: map[string]string{ - common.DefaultInstancetypeEnv: "u1.medium", - common.DefaultPreferenceEnv: "centos.7", - }, - }, - ), - ) -}) - -func TestCentos(t *testing.T) { - RegisterFailHandler(Fail) - RunSpecs(t, "Centos Suite") -} diff --git a/artifacts/centos/testdata/centos7.checksum b/artifacts/centos/testdata/centos7.checksum deleted file mode 100644 index 8afa2187..00000000 --- a/artifacts/centos/testdata/centos7.checksum +++ /dev/null @@ -1,171 +0,0 @@ -9c315cf14987e191c9149a020da332931d0a36f215f9c62c3d42866fd0f4c7c9 CentOS-7-aarch64-GenericCloud-1606.qcow2.xz -90d0bc68eb901ba7d7178714837bed62afd414cc0d083cd08cb781a6831cba36 CentOS-7-aarch64-GenericCloud-1610.qcow2.xz -131d99de0b6bfc1da6e76a660cc6378de8f347bb9785478ef4e8624ec536025b CentOS-7-aarch64-GenericCloud-1701.qcow2.xz -567ba2655047281ce466acd2148962d6040c61227aa5d4a092123c026964ca89 CentOS-7-aarch64-GenericCloud-1708.qcow2.xz -fb566f76c7d107cabb21f852dd6183f165c6aa870ef311fe11b1697774565af4 CentOS-7-aarch64-GenericCloud-2003.qcow2.xz -e80fe82b6dafa02a4d58ff4acdb06c354dd0b9e0ab51bd41fd460de6b583b0ed CentOS-7-ppc64le-GenericCloud-2003.qcow2.xz -e324e3ab1d24a1bbf035ddb365e7f9058c0b454acf48d7aa15c5519fae5998ab CentOS-7-x86_64-GenericCloud-1503.qcow2 -1465fd924f6978467a5e4bd98ced42979d6ecd7161eaa0a2757060e907039b0f CentOS-7-x86_64-GenericCloud-1503.qcow2c -8230e6bec9373d2f26819797985f1b47b8d7214a2cb82c058fe7955014ecaf04 CentOS-7-x86_64-GenericCloud-1503.qcow2.xz -3ac3e852f68cc4ce61e6c226b5c9ca0508eed83105767b5240c3309894b8ed22 CentOS-7-x86_64-GenericCloud-1503.raw.xz -0952b651a6248998380aef73d9961ccb45af9b1823579bc2b72d28fa5fe5dea7 CentOS-7-x86_64-GenericCloud-1508.qcow2 -8bb46b6619f05d5e58a6fbf929a45abe61b58e87c9a02ae44a0f65e859f3c1b9 CentOS-7-x86_64-GenericCloud-1508.qcow2c -a8f9e24ad80901cbd6894662c1a20c0173892c002b4f66ec9a935650b34d6461 CentOS-7-x86_64-GenericCloud-1508.qcow2.xz -1ed60e89401fcd4fe1b7387452ff41afd617c30e10dd5623438a0231b5694be9 CentOS-7-x86_64-GenericCloud-1509.qcow2 -7747e2e4cbac0259e9c6bf0be749ab43778414010d918f56107776b2c3b2e955 CentOS-7-x86_64-GenericCloud-1509.qcow2c -fbada05b9d8067f16138a645376e188c19d0c3cbf93401ba1c5a899ac1eaac81 CentOS-7-x86_64-GenericCloud-1509.qcow2.xz -8a40e21cdab9feb57c06d7b77d3c43bd56229b445fa9c1868fda29dea066dc6c CentOS-7-x86_64-GenericCloud-1510.qcow2 -32f4dc21d8e596eb13aa698f983442f46f1396068cc9008eaa66ff10fa3fc25f CentOS-7-x86_64-GenericCloud-1510.qcow2c -9461006300d65172f5668d8875f2aad7b54f7ba4e9c5435d65a84a5a2d66e39b CentOS-7-x86_64-GenericCloud-1510.qcow2.xz -0ef6f432a0b032b2dfac958e4fb0fcabce456af35807993d00cc82f30d60df8e CentOS-7-x86_64-GenericCloud-1511.qcow2 -45cfe2fe6a4c552e6cbe487c3195c6b0ba04d1f2c281bd696cf43cb72f1429c6 CentOS-7-x86_64-GenericCloud-1511.qcow2c -e2bf8d292d3a50b988b082c2929b46836b8c2d9eb804bbb79eb0cc20fc8e7907 CentOS-7-x86_64-GenericCloud-1511.qcow2c.xz -c2e16bab8b5283cae77deb5bb0aad0a494cd4aabcb5dc5c71363056e88b93c0f CentOS-7-x86_64-GenericCloud-1511.qcow2.xz -e639a99ce866175a756e0a9fc9ef48b7b741a9c3fd2d1999d381ecf76ad73e94 CentOS-7-x86_64-GenericCloud-1511.raw.tar.gz -9db4d4d9037adad1d8b3a7ed8e77e79f52c9203873c9eca02df6f94c57f9a3d0 CentOS-7-x86_64-GenericCloud-1601.qcow2 -a51e4ec10b3a3ce28b4fbcef9ecf0a29b8d580d1931414f1d8869b2c0cfb681c CentOS-7-x86_64-GenericCloud-1601.qcow2c -b5be6844cde2b5520f9b566935af8abc69517e74cc8344d45280ba30fb29814b CentOS-7-x86_64-GenericCloud-1601.qcow2.xz -354cf1f5a594edc1cef6578cd736a5a998f816b5a1ff3553eac42151b6708de4 CentOS-7-x86_64-GenericCloud-1601.raw.tar.gz -1b777fa1ea2b2cf0be7ed6ecce54ef18ece5c6551fb291549b887e33b78d7c78 CentOS-7-x86_64-GenericCloud-1602.qcow2 -bc0f51d9376001f8973595b71105b9d53c8c27b3e0969676aab2ab036cc4d835 CentOS-7-x86_64-GenericCloud-1602.qcow2c -dd0f5e610e7c5ffacaca35ed7a78a19142a588f4543da77b61c1fb0d74400471 CentOS-7-x86_64-GenericCloud-1602.qcow2.xz -87421b6559d2572ef4070d7fcd382331662e61421def808172c16ad005f5c50f CentOS-7-x86_64-GenericCloud-1602.raw.tar.gz -c88230cde563ca29b065d53819586262f79a64769736e014bf6dabaa61a20968 CentOS-7-x86_64-GenericCloud-1603.qcow2 -6d17808cf208bee3243f51b84e9bfb10b06f0cd04e2930505d9ea4fba2583bc5 CentOS-7-x86_64-GenericCloud-1603.qcow2c -f91e602120a728f144da605baf0d5f4ad59293921bee99cc4aa3a1ab65e6d445 CentOS-7-x86_64-GenericCloud-1603.qcow2.xz -5c5cacfc1f0700cc7d48d667933cd730f7443e866caeda94d8e205a8bc8ce511 CentOS-7-x86_64-GenericCloud-1603.raw.tar.gz -2e93aad140cd9fe72a731c486814c3defacf16bfbf4368610ea5ed1bcbda8450 CentOS-7-x86_64-GenericCloud-20140929_01.qcow2 -7710ffdd497cf00fc72c22a3fa7cc7adb3424d3542521ca8fbe19eba9ded403f CentOS-7-x86_64-GenericCloud-20141129_01.qcow2 -db42e4fb9565e75f0acbe6b54a5b8822f3f1e9783fb1a553e1552c72ceaff8df CentOS-7-x86_64-GenericCloud-20141129_01.qcow2c -9b0b38c48a24164c15c33625972b87835501b6994c3ee894f6b79ce40e7d5e54 CentOS-7-x86_64-GenericCloud-20141129_01.qcow2.xz -30b0459d3cf82a83952991124e253a6c09d70ac509707349bf1813fe730dbfb4 CentOS-7-x86_64-GenericCloud-20150628_01.qcow2 -55a69b843cd451321d0729dd4c83e41e87540702e195dd30f94714452081640b CentOS-7-x86_64-GenericCloud-20150628_01.qcow2c -3e0dc21ed970ba001be30c917b5ed831da43ac0b56fbdb7bf217f9836ff455ca CentOS-7-x86_64-GenericCloud-20150628_01.qcow2.xz -6232c175cc9a75a59fa07bafa4ad90676af71c4280b4c541294591a1e8e26ff3 CentOS-7-x86_64-GenericCloud-1604.qcow2 -74939ab27ee2c653d7385f5718c820d12168cd4a9267edbaf1e22b3dba57e4d0 CentOS-7-x86_64-GenericCloud-1604.qcow2c -ac832790bee379fe28f814e22f607f01111fff366fe08f81e14f35dd19bcec53 CentOS-7-x86_64-GenericCloud-1604.qcow2.xz -0a314a54be173b75e0c3c54dcd404ee29966a9b045a7dc6e13bda40bc194ab3f CentOS-7-x86_64-GenericCloud-1604.raw.tar.gz -97848cb9fc941a59d901454093d3edececbaa002f853a784de6bcac4189bb861 CentOS-7-x86_64-GenericCloud-1605.qcow2 -7c34eb035f9a95fd4e6a0d833d65841b0467d1617ead2fe32c9394fb7215e1a7 CentOS-7-x86_64-GenericCloud-1605.qcow2c -5c6a56a30041e69fa77810abbc8299b390db08724de56e005136d8895e70ab0f CentOS-7-x86_64-GenericCloud-1605.qcow2.xz -4ac077fcaf51332991b9939cc9a4aaa15776d72f9c9ee592fe416c2a5c4836ab CentOS-7-x86_64-GenericCloud-1605.raw.tar.gz -13c81e28cfa60c8c05cb513caaa48fea62609a0f16abb1af3aebeee38bd0da9a CentOS-7-x86_64-GenericCloud-1606.qcow2 -1ecd1e5f09c530ecc13574f54b05e6a612c450da03ab4bc884804be068b0a06f CentOS-7-x86_64-GenericCloud-1606.qcow2c -2a7450ff9bb100fbfd56dcf6e7cf20a72376c1d8d1e9a619bdac17d843395a96 CentOS-7-x86_64-GenericCloud-1606.qcow2.xz -03a29cbc53f0f5a2cf927c372c4c8d5a7f286b44d0d66a20157da3c0f44e95e8 CentOS-7-x86_64-GenericCloud-1606.raw.tar.gz -9a7002826a916521908c26e913092fe772356cdb5b81e7e73bf60a53c106417c CentOS-7-x86_64-GenericCloud-1607.qcow2 -1b79ff669b74aaededc1ebccef8586016dffd26a62f5e8078a737c0f712e4bc7 CentOS-7-x86_64-GenericCloud-1607.qcow2c -b916fce7d38ad7f837486816cd0885cb965dd78e3645e316a57c2ae6d631d2ab CentOS-7-x86_64-GenericCloud-1607.qcow2.xz -fa2a8bd6813b89aedcab53d3c969f01c1af3889dd49fa843b03422632f5d0d86 CentOS-7-x86_64-GenericCloud-1607.raw.tar.gz -b56ed1a3a489733d3ff91aca2011f8720c0540b9aa27e46dd0b4f575318dd1fa CentOS-7-x86_64-GenericCloud-1608.qcow2 -927b342dde7bd4cc78418d70d4a3f5e8c08af1b4f134100450bdfbd9054b9e21 CentOS-7-x86_64-GenericCloud-1608.qcow2c -bef3975a0ddde9a0ada9e36e80c172c674cb43bfac0977a268a3a7a98d14798d CentOS-7-x86_64-GenericCloud-1608.qcow2.xz -2d0fe07b6b47a5e4faa3cfc508f4e8602e870688364f7601c10001084da51849 CentOS-7-x86_64-GenericCloud-1608.raw.tar.gz -cae2602c81b714d36afbe825e3c02dc6d338843af3af18613ff91779bc50b770 CentOS-7-x86_64-GenericCloud-1611.qcow2 -3bb25432335e289fc900722fb71b0d88bc9d01f4a40b547f90c36846a0937371 CentOS-7-x86_64-GenericCloud-1611.qcow2c -4c1dda1c6b493eb609413cfbc4f1a0306d8e569fe3064e84684b7f941f126412 CentOS-7-x86_64-GenericCloud-1611.qcow2.xz -dfb42dd125325ed6110c6c9b7dbe52368ebc3bf8cd458b635e2c0df0f2f417a3 CentOS-7-x86_64-GenericCloud-1611.raw.tar.gz -559bebb4abb2fdf3bd88c917cc11efb1975bfe4494e666d133a3148ec4e6225d CentOS-7-x86_64-GenericCloud-1612.qcow2 -e12a547bb234fa10f2214270cef85dd2fdf61ef3f48271c4257c17b1c96f6647 CentOS-7-x86_64-GenericCloud-1612.qcow2c -06b1a5982e9efe205803d7e78f25a29875e0704fbffd1530daa5c0626be13905 CentOS-7-x86_64-GenericCloud-1612.qcow2.xz -0b79324e10202ac5516035aff880940acc2a72d4d3a8b34607a83621688d3a81 CentOS-7-x86_64-GenericCloud-1612.raw.tar.gz -62fe56489b7c9cef341f80865b2d6f2a520ebad3fa1e5f486fb0d23d63a69eb4 CentOS-7-x86_64-GenericCloud-1701.qcow2 -8131b4eefa15779f2a8ef3544212e1e5421d03ba0392e9642c8a1190411182ac CentOS-7-x86_64-GenericCloud-1701.qcow2c -e9012a611750b9539f3fbeff20a4d0514798dccc9a15054814ffff5d8aa8a247 CentOS-7-x86_64-GenericCloud-1701.qcow2.xz -c5225a18e479604105ea9390a1486111cf30ed44fdb5b09e15bfed6911d2381b CentOS-7-x86_64-GenericCloud-1701.raw.tar.gz -0cfd71bfbb4dba3097999dcbe1e611d6c3407f1b30936e9a6e437f320dfb7be9 CentOS-7-x86_64-GenericCloud-1702.qcow2 -49c4a308a928b4d80ff8907081d530ef458ba9579bd524f18de1b07eade7fdd2 CentOS-7-x86_64-GenericCloud-1702.qcow2c -94d55e10b8e51bea8efbc8f084e3718a0c0e9e5ebcab6caee203ed76ad412c76 CentOS-7-x86_64-GenericCloud-1702.qcow2.xz -d04910d2c98c2264a5594f4fd410e0ecf587d857c383d5807bc4d61f538e7c10 CentOS-7-x86_64-GenericCloud-1702.raw.tar.gz -36207cdc6663b4688bee49e8e9668cde187ad28f75fdfa88dedd37a69aa6275e CentOS-7-x86_64-Azure-1703.qcow2 -588f897c32fd360a9c1837962bd5efc22332acfeef9b4c4fd398e93d9ab1599a CentOS-7-x86_64-GenericCloud-1703.qcow2 -c3d9283b99ef80a0a4a9ae84dab9123538eadb73397ad6bf0f58f6f61700772a CentOS-7-x86_64-GenericCloud-1703.qcow2c -5fd2096843e368945dd4b97efafed52f4936155ad9bf8d6a97d6448657829540 CentOS-7-x86_64-GenericCloud-1703.qcow2.xz -6f97733d3a8da96db03c4b25dff31dd279db6654d22d75a18fec48e99055aaa4 CentOS-7-x86_64-GenericCloud-1703.raw.tar.gz -4eccdfb24db5cf101f9da4a377803ddb6a6fafa1a34524fe87a118a689e7d3de CentOS-7-x86_64-Azure-1704.qcow2 -5bf5940555350c6cec0d4ec1b7b83b5eaef14849a255676e0ab0514f11674dbd CentOS-7-x86_64-Azure-1704.raw.tar.gz -c4d808e02d716698678385d1a73b02ee0c082f65e94d26e1046e9a303e893b3e CentOS-7-x86_64-GenericCloud-1704.qcow2 -270232aced35fec4b12c0ace8b18c8358959bea58f3eaa04cc638995102da07e CentOS-7-x86_64-GenericCloud-1704.qcow2c -7ddc89f3413215abbe224798ebc04a293ed12b436eed5280c831270eacdf48ce CentOS-7-x86_64-GenericCloud-1704.raw.tar.gz -0c9f67fa2e09b54c388b1f6fed39a388cfd1909a463bab14d6c9be941b9adde3 CentOS-7-x86_64-GenericCloud-1704.qcow2.xz -457172f9e61311e0e4e7a9d697698bf7f7247b4c6ebab508b9a9398914e8812e CentOS-7-x86_64-Azure-1705.qcow2 -fabea65fb2848e34be875dee248cece32cf05a9bdb0f29a6e0583535e82e5e91 CentOS-7-x86_64-GenericCloud-1705.qcow2 -bfca7614fddd14de3658384eaad1f08eae6f06dd4532ea9cae1f0072b8abede7 CentOS-7-x86_64-GenericCloud-1705.qcow2c -eceacf144a3f4e5d0c510120ed76875e61abdaf97e226e94be6e5623bc026a41 CentOS-7-x86_64-GenericCloud-1705.qcow2.xz -b2643300b900c1a1922793248f6477e5009c0846c3305b072f5080fe6326199f CentOS-7-x86_64-GenericCloud-1705.raw.tar.gz -a32675f42775bc077d45c97caa12cf8312cbe1c632c188f56266ecdf0db001ca CentOS-7-x86_64-Azure-1706.qcow2 -8b473bc476bb263ecefea9befd2f9f12a9593bdffb7122872f719c76568fdfb8 CentOS-7-x86_64-GenericCloud-1706.qcow2 -85a0311401f358437601d62e29ee7327b999f27dbfde054f85072efcf3e24763 CentOS-7-x86_64-GenericCloud-1706.qcow2c -ac20b6dd568210dc5a369745ad139397e19a92299db4acb44b595d779618c92e CentOS-7-x86_64-GenericCloud-1706.qcow2.xz -0be942c330744c8844e81b64f1938d0bc96fd1c38989d4035d89b451f88aff76 CentOS-7-x86_64-GenericCloud-1706.raw.tar.gz -c0984328aba0aac9270cf7b11b20dbe54f953bbfe465e678555c0516c042051b CentOS-7-x86_64-Azure-1707.qcow2 -52d358bcbcd7b1c467bccfdb29535241e9121441f26ca3a6befe035b7b5987f1 CentOS-7-x86_64-GenericCloud-1707.qcow2 -8c185ab0dffa5afb26045f2b6d92e6d07abbb057b2ecea79b12e65ff9c3da86f CentOS-7-x86_64-GenericCloud-1707.qcow2c -e139c5b7a799f3f1d48aa897f1b8165c18ef6eeb212cadf138d32537600c6005 CentOS-7-x86_64-GenericCloud-1707.qcow2.xz -2e6977a97bf27178efd0c969745422cd29a2707213af0b78c950e73b93de0389 CentOS-7-x86_64-GenericCloud-1707.raw.tar.gz -a4436a3d0dc52d3492c69c3df29f6e74044a804d631de00ec5127de2b90e9f0c CentOS-7-x86_64-GenericCloud-1708.qcow2 -97ea5a1f8468b1ae1cbded3a88dd69ad1572a2f3765e8ef54bca7ddcdcd9deee CentOS-7-x86_64-GenericCloud-1708.qcow2c -0df197d7d41e83afd676867ca97ac7f9d96d42d338eff67ec18d75f932850f3b CentOS-7-x86_64-GenericCloud-1708.qcow2.xz -a9a6de2ff1598fccd5848ffe53c73e0c86f4350dc3fd096712243049ee5b983a CentOS-7-x86_64-GenericCloud-1708.raw.tar.gz -c19d6fd4bccc9b88f69b2b8dab25e16ef122181908479d75671117ff663787e9 CentOS-7-x86_64-Azure-1710.qcow2 -4b68e18390cf01a4db94cb1ef31ba8bad76a3887c5c7b29a66f0fa36447de866 CentOS-7-x86_64-GenericCloud-1710.qcow2 -76e28dc790c85bd6066753e2570c1b58e42b4cbebfd62c4eb24bb1098357d2b3 CentOS-7-x86_64-GenericCloud-1710.qcow2c -216a7117c7284b70e717ef151b5358f4efbdaf3fa6cfe4c68f23eccb3f1edf58 CentOS-7-x86_64-GenericCloud-1710.qcow2.xz -ba4fadf6728a8a7c8f5ac7252e7174f5ed01c46c9a448732d21f2c66e21e13a0 CentOS-7-x86_64-GenericCloud-1710.raw.tar.gz -ab59cec353e6c2dbb790a62814333d42ccc32b00ed35667a02dd35444574e2ec CentOS-7-x86_64-Azure-1711.qcow2 -d4adbe66209821b510f09ce63a29abbe37e69684678472ff16334103e9bd9e88 CentOS-7-x86_64-GenericCloud-1711.qcow2 -780eeaa1d2c867443ea46155a0a030414ff7cd064879b49e7655ec1858534e58 CentOS-7-x86_64-GenericCloud-1711.qcow2c -9d07d46131da28d326378b30ef3858837a7f3df4c0b82a5cd12c3825eb43594b CentOS-7-x86_64-GenericCloud-1711.qcow2.xz -e84b34d912d38e66fbd09533a72b556b3498a1ba9eb1e852cab4a2a25af177b6 CentOS-7-x86_64-GenericCloud-1711.raw.tar.gz -fb0f10fe4a2e9eaaf2d55153289dcb5ddd08e21bc080f92f2138588731df29d6 CentOS-7-x86_64-GenericCloud-1801-01.qcow2 -268c9ecfede5dac58306035bc69613743247a7f895d9f98de835634511e901a1 CentOS-7-x86_64-GenericCloud-1801-01.qcow2c -b5dc04249b9f1c0ea849b968efe748cf5f3df44c13b70c68308075d9efca3cbd CentOS-7-x86_64-GenericCloud-1801-01.qcow2.xz -4288a7c038066d4686b7d829b30b662b8cc76dd3f380db452e6ac4358d6cbd45 CentOS-7-x86_64-GenericCloud-1801-01.raw.tar.gz -93613cd4fce8a4e5de793e49357853d96ee695f6842eca379d333ed3bc593cbb CentOS-7-x86_64-GenericCloud-1802.qcow2 -701f98e2cdb3d6c5420a9f3a7cbb67e4c501cc0f1b77d7ecf10fdb98f7420cb8 CentOS-7-x86_64-GenericCloud-1802.qcow2c -72fca65f5359fa28d8b214e2bc1dedf7290935817efccc4308002320cc8bce97 CentOS-7-x86_64-GenericCloud-1802.qcow2.xz -6b22f3b61c0ad73d6b1bbb140822c3b976779611e9fc7a0fde0f3774ac8539b1 CentOS-7-x86_64-GenericCloud-1802.raw.tar.gz -d7d720e4c2970a4dade749bf504bf8afe8b638a30c614efc43a6c769c1b5bc46 CentOS-7-x86_64-GenericCloud-1804_02.qcow2 -93fbb78b5b9fa801d7276d9ed2abb382f847e7c4438b495ead65115d8a5b1db3 CentOS-7-x86_64-GenericCloud-1804_02.qcow2c -e6c577e74289158bf87811c83b45c4f0614bd874142ac7721586daf8e809f0fa CentOS-7-x86_64-GenericCloud-1804_02.qcow2.xz -06ddd93b05577565af85ab2b3dabcf7d42f3af1f3fa32a53e3582afc2c995180 CentOS-7-x86_64-GenericCloud-1804_02.raw.tar.gz -ac0a6709f9ce047111d13d51c21ca3d4961b5943ffb7d7479fdddc1fb9608d7a CentOS-7-x86_64-GenericCloud-1805.qcow2 -3b69be275448bcfd443796fb508ca154ea71b29acbbe11f25848d2ece146c78f CentOS-7-x86_64-GenericCloud-1805.qcow2c -b34859272e29ddcc3a1f27a214cef75ba661ec2a28d956cad46cd132b54b00c2 CentOS-7-x86_64-GenericCloud-1805.qcow2.xz -4e0decf64b7a2f95ec27841defc92563e64e7df5e9404f2974dbe49ea8572a63 CentOS-7-x86_64-GenericCloud-1805.raw.tar.gz -0c203efef32602f0dea0f4e06fba4d2100c0ecdde0aa57db2faf41d7567af65c CentOS-7-x86_64-GenericCloud-1808.qcow2 -76459a96945642cfd0ce9948e3e389055496d79c7c2c5194275ee2665a7ce652 CentOS-7-x86_64-GenericCloud-1808.qcow2c -9cc2e9fefb7d8ac8e8a6973c20edb00f12c96614086b1fea5c4f02576be875f6 CentOS-7-x86_64-GenericCloud-1808.qcow2.xz -e366d8f0e52ef7caf8e591dc5ca4e1ad450ca02da5dd92eb8052abdf29e24ed5 CentOS-7-x86_64-GenericCloud-1808.raw.tar.gz -42c062df8a8c36991ec0282009dd52ac488461a3f7ee114fc21a765bfc2671c2 CentOS-7-x86_64-GenericCloud-1809.qcow2 -c1c71ffe8fd1ec45a77033f1fd035ca0c806ed4b89534a52855220cd3c670e4c CentOS-7-x86_64-GenericCloud-1809.qcow2c -f0ea5dd0e9204528e14bebaeff46d1e63fc5232e62d9116d5eab04a533c95479 CentOS-7-x86_64-GenericCloud-1809.qcow2.xz -d7b4debec1edbdda0e5e68d18daf47800fd77a9e3775e43496dbb9e53ff6cbe3 CentOS-7-x86_64-GenericCloud-1809.raw.tar.gz -f80b039d13a5e1ab55f592d27faf806d997bdb4c522611a37f66e6285e99b28c CentOS-7-x86_64-GenericCloud-1811.qcow2 -b9b65baf1178b563cbf9c953ee94afd2145686c8de48fb0cbdffc780bfd71042 CentOS-7-x86_64-GenericCloud-1811.qcow2c -3773d8c53bed6b10a2245dbe804dc86ae38f0c49616f558f77c886b2c91eb66e CentOS-7-x86_64-GenericCloud-1811.qcow2.xz -745b4d99ba5527655a1ec6166bfe4b715ab210955279fcaa14b8dc0a2e2b0e72 CentOS-7-x86_64-GenericCloud-1811.raw.tar.gz -76050d4624210954929d9d7a97a98611619a5fd02067fd7737e26f5a3a5e5333 CentOS-7-x86_64-GenericCloud-1901.qcow2 -4cf51d96c4ff52d63d0465e3871b6b58b58a9733e6d9d6f6917a582123d123b6 CentOS-7-x86_64-GenericCloud-1901.qcow2c -462d2a5b23d78e92b553d67edb77b77755b75cb184babe281228fb3c567be518 CentOS-7-x86_64-GenericCloud-1901.qcow2.xz -244703a4c5c6a6aa72a8f51742cddb2c3d46ee37aaca2481eb9cfc1ba08927ad CentOS-7-x86_64-GenericCloud-1901.raw.tar.gz -b376afdc0150601f15e53516327d9832216e01a300fecfc302066e36e2ac2b39 CentOS-7-x86_64-GenericCloud-1905.qcow2 -59a0f89d1bb48f9ac3aaf1f0a6aefd3eb05f9e345da5ee9f62afe8bad83b0074 CentOS-7-x86_64-GenericCloud-1905.qcow2c -6738c731a723f03b8880d7c4613e75dbe33736145ea89a7d4595450f06507ec2 CentOS-7-x86_64-GenericCloud-1905.qcow2.xz -954f68b517f6b9866a20d5b34630f51f648493631ac24747d3027c5a15b34a7d CentOS-7-x86_64-GenericCloud-1905.raw.tar.gz -ec2b59d62f0bc2b87a5fe01c5cc543cb393180da1f12d4372216ba1f371db2e1 CentOS-7-x86_64-Azure-1907.qcow2 -f0ae12d4ed950cb8ec1260fcec348d319cc522d21bbf0630312005a49bcfd0ef CentOS-7-x86_64-Azure-1907.vhd -520d01c2f2e1ed24cb2f15a4325aa30773930a2961b5484a68cf11b4a415c512 CentOS-7-x86_64-GenericCloud-1907.qcow2 -2e4317beb18262af6b5f283a9b6de75700e35cfdb322ae0e6865f355bc599327 CentOS-7-x86_64-GenericCloud-1907.qcow2c -24d4c4f20f48611f43c1fa420b66e2e552b2e341c318e8e39442df57021e9e7d CentOS-7-x86_64-GenericCloud-1907.qcow2.xz -6cdb62a5f429470df1392df0c09901b05bc45785db70ffcf05a13827430d61ef CentOS-7-x86_64-GenericCloud-1907.raw.tar.gz -1db30c9c272fb37b00111b93dcebff16c278384755bdbe158559e9c240b73b80 CentOS-7-x86_64-GenericCloud-2003.qcow2 -b7555ecf90b24111f2efbc03c1e80f7b38f1e1fc7e1b15d8fee277d1a4575e87 CentOS-7-x86_64-GenericCloud-2003.qcow2c -963866edac9150db8b5c04df9ae80273a11eec6218f114cbb96cb4b53e33803c CentOS-7-x86_64-GenericCloud-2003.qcow2.xz -100e0fd9ffde6259fa9156090bf11258124a6ade8c91ea6f43cb47cca07f7b0e CentOS-7-x86_64-GenericCloud-2003.raw.tar.gz -51c0222aa4bc7d966fc044eb6ce9182993a1dc398eaa595e58abd0d361439baf CentOS-7-aarch64-GenericCloud-2009.qcow2 -f08fde34542218e8750a8655001a31489b0e9fe7ecd15aca28cb121e4e9d7121 CentOS-7-aarch64-GenericCloud-2009.qcow2c -4e8c53386406efea88c3c5d2b0b6df123a3a4cd37dc868921c706a003cc2ae34 CentOS-7-ppc64le-GenericCloud-2009.qcow2 -ec97bb60d0c962a78730ea55f4dbb930a1e3d4a9eb880c4177d0ebd99aa70c18 CentOS-7-ppc64le-GenericCloud-2009.qcow2c -e38bab0475cc6d004d2e17015969c659e5a308111851b0e2715e84646035bdd3 CentOS-7-x86_64-GenericCloud-2009.qcow2 -7ba4513d96591496213a07bbe25e3eb643d61491924c8548a91815b420fd9827 CentOS-7-x86_64-GenericCloud-2009.qcow2c \ No newline at end of file diff --git a/cmd/medius/common/registry.go b/cmd/medius/common/registry.go index 8261ce44..680b00cd 100644 --- a/cmd/medius/common/registry.go +++ b/cmd/medius/common/registry.go @@ -5,7 +5,6 @@ import ( "github.com/sirupsen/logrus" - "kubevirt.io/containerdisks/artifacts/centos" "kubevirt.io/containerdisks/artifacts/centosstream" "kubevirt.io/containerdisks/artifacts/fedora" "kubevirt.io/containerdisks/artifacts/generic" @@ -25,12 +24,6 @@ type Entry struct { } var staticRegistry = []Entry{ - { - Artifacts: []api.Artifact{ - centos.New("7-2009", defaultEnvVariables("u1.medium", "centos.7")), - }, - UseForDocs: true, - }, { Artifacts: []api.Artifact{ centosstream.New("9", "x86_64", &docs.UserData{Username: "cloud-user"}, defaultEnvVariables("u1.medium", "centos.stream9")),