From fbe8e69f16021e7a089a8367d96d15ef47ef71a7 Mon Sep 17 00:00:00 2001 From: Josue David Hernandez Gutierrez Date: Thu, 31 Oct 2024 01:49:23 +0000 Subject: [PATCH 3/8] Removing non supported image types image types removed are: Edge Images Openstack Images Vmdk Images GPC Images MinimalRaw Images Vmk Images Ova Images Wsl Images Signed-off-by: Josue David Hernandez Gutierrez --- internal/cloudapi/v2/compose_test.go | 54 -------- .../images/pkg/distro/rhel/rhel8/distro.go | 115 ------------------ .../images/pkg/distro/rhel/rhel9/distro.go | 113 ----------------- 3 files changed, 282 deletions(-) diff --git a/internal/cloudapi/v2/compose_test.go b/internal/cloudapi/v2/compose_test.go index 08458d6..9c815d5 100644 --- a/internal/cloudapi/v2/compose_test.go +++ b/internal/cloudapi/v2/compose_test.go @@ -648,36 +648,6 @@ func TestGetImageRequests_ImageTypeConversion(t *testing.T) { expectedImageType: "azure-sap-rhui", expectedTargetName: target.TargetNameAzureImage, }, - { - requestedImageType: ImageTypesEdgeCommit, - requestedDistros: []string{rhel8, centos8, rhel9, centos9}, - expectedImageType: "edge-commit", - expectedTargetName: target.TargetNameAWSS3, - }, - { - requestedImageType: ImageTypesEdgeContainer, - requestedDistros: []string{rhel8, centos8, rhel9, centos9}, - expectedImageType: "edge-container", - expectedTargetName: target.TargetNameContainer, - }, - { - requestedImageType: ImageTypesEdgeInstaller, - requestedDistros: []string{rhel8, centos8, rhel9, centos9}, - expectedImageType: "edge-installer", - expectedTargetName: target.TargetNameAWSS3, - }, - { - requestedImageType: ImageTypesGcp, - requestedDistros: []string{rhel8, centos8, rhel9, centos9}, - expectedImageType: "gce", - expectedTargetName: target.TargetNameGCP, - }, - { - requestedImageType: ImageTypesGcpRhui, - requestedDistros: []string{rhel8, rhel9}, - expectedImageType: "gce-rhui", - expectedTargetName: target.TargetNameGCP, - }, { requestedImageType: ImageTypesGuestImage, requestedDistros: []string{fedora, rhel8, centos8, rhel9, centos9}, @@ -732,36 +702,12 @@ func TestGetImageRequests_ImageTypeConversion(t *testing.T) { expectedImageType: "live-installer", expectedTargetName: target.TargetNameAWSS3, }, - { - requestedImageType: ImageTypesMinimalRaw, - requestedDistros: []string{fedora, rhel8, centos8, rhel9, centos9}, - expectedImageType: "minimal-raw", - expectedTargetName: target.TargetNameAWSS3, - }, { requestedImageType: ImageTypesOci, requestedDistros: []string{fedora, rhel8, centos8, rhel9, centos9}, expectedImageType: "oci", expectedTargetName: target.TargetNameOCIObjectStorage, }, - { - requestedImageType: ImageTypesVsphere, - requestedDistros: []string{fedora, rhel8, centos8, rhel9, centos9}, - expectedImageType: "vmdk", - expectedTargetName: target.TargetNameAWSS3, - }, - { - requestedImageType: ImageTypesVsphereOva, - requestedDistros: []string{fedora, rhel8, centos8, rhel9, centos9}, - expectedImageType: "ova", - expectedTargetName: target.TargetNameAWSS3, - }, - { - requestedImageType: ImageTypesWsl, - requestedDistros: []string{fedora, rhel8, centos8, rhel9, centos9}, - expectedImageType: "wsl", - expectedTargetName: target.TargetNameAWSS3, - }, } for _, tt := range tests { diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/distro.go index 7441eb8..24f58be 100644 --- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/distro.go +++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/distro.go @@ -97,17 +97,6 @@ func newDistro(name string, minor int) *rhel.Distribution { mkOCIImgType(rd), ) - x86_64.AddImageTypes( - &platform.X86{ - BIOS: true, - UEFIVendor: rd.Vendor(), - BasePlatform: platform.BasePlatform{ - ImageFormat: platform.FORMAT_QCOW2, - }, - }, - mkOpenstackImgType(), - ) - ec2X86Platform := &platform.X86{ BIOS: true, UEFIVendor: rd.Vendor(), @@ -142,50 +131,12 @@ func newDistro(name string, minor int) *rhel.Distribution { x86_64.AddImageTypes( bareMetalX86Platform, - mkEdgeOCIImgType(rd), - mkEdgeCommitImgType(rd), - mkEdgeInstallerImgType(rd), mkImageInstaller(), ) - gceX86Platform := &platform.X86{ - UEFIVendor: rd.Vendor(), - BasePlatform: platform.BasePlatform{ - ImageFormat: platform.FORMAT_GCE, - }, - } - - x86_64.AddImageTypes( - gceX86Platform, - mkGceImgType(rd), - ) - - x86_64.AddImageTypes( - &platform.X86{ - BIOS: true, - UEFIVendor: rd.Vendor(), - BasePlatform: platform.BasePlatform{ - ImageFormat: platform.FORMAT_VMDK, - }, - }, - mkVmdkImgType(), - ) - - x86_64.AddImageTypes( - &platform.X86{ - BIOS: true, - UEFIVendor: rd.Vendor(), - BasePlatform: platform.BasePlatform{ - ImageFormat: platform.FORMAT_OVA, - }, - }, - mkOvaImgType(), - ) - x86_64.AddImageTypes( &platform.X86{}, mkTarImgType(), - mkWslImgType(), ) aarch64.AddImageTypes( @@ -199,20 +150,9 @@ func newDistro(name string, minor int) *rhel.Distribution { mkQcow2ImgType(rd), ) - aarch64.AddImageTypes( - &platform.Aarch64{ - UEFIVendor: rd.Vendor(), - BasePlatform: platform.BasePlatform{ - ImageFormat: platform.FORMAT_QCOW2, - }, - }, - mkOpenstackImgType(), - ) - aarch64.AddImageTypes( &platform.Aarch64{}, mkTarImgType(), - mkWslImgType(), ) bareMetalAarch64Platform := &platform.Aarch64{ @@ -222,9 +162,6 @@ func newDistro(name string, minor int) *rhel.Distribution { aarch64.AddImageTypes( bareMetalAarch64Platform, - mkEdgeOCIImgType(rd), - mkEdgeCommitImgType(rd), - mkEdgeInstallerImgType(rd), mkImageInstaller(), ) @@ -238,7 +175,6 @@ func newDistro(name string, minor int) *rhel.Distribution { aarch64.AddImageTypes( rawAarch64Platform, mkAmiImgTypeAarch64(), - mkMinimalRawImgType(), ) ppc64le.AddImageTypes( @@ -288,44 +224,15 @@ func newDistro(name string, minor int) *rhel.Distribution { }, } - rawUEFIx86Platform := &platform.X86{ - BasePlatform: platform.BasePlatform{ - ImageFormat: platform.FORMAT_RAW, - }, - BIOS: false, - UEFIVendor: rd.Vendor(), - } - - x86_64.AddImageTypes( - rawUEFIx86Platform, - mkMinimalRawImgType(), - ) - if rd.IsRHEL() { if common.VersionGreaterThanOrEqual(rd.OsVersion(), "8.6") { // image types only available on 8.6 and later on RHEL // These edge image types require FDO which aren't available on older versions - x86_64.AddImageTypes( - bareMetalX86Platform, - mkEdgeRawImgType(), - ) - - x86_64.AddImageTypes( - rawUEFIx86Platform, - mkEdgeSimplifiedInstallerImgType(rd), - ) - x86_64.AddImageTypes( azureX64Platform, mkAzureEap7RhuiImgType(), ) - aarch64.AddImageTypes( - rawAarch64Platform, - mkEdgeRawImgType(), - mkEdgeSimplifiedInstallerImgType(rd), - ) - // The Azure image types require hyperv-daemons which isn't available on older versions aarch64.AddImageTypes( azureAarch64Platform, @@ -373,36 +280,14 @@ func newDistro(name string, minor int) *rhel.Distribution { ) } - // add GCE RHUI image to RHEL only - x86_64.AddImageTypes( - gceX86Platform, - mkGceRhuiImgType(rd), - ) - // add s390x to RHEL distro only rd.AddArches(s390x) } else { - x86_64.AddImageTypes( - bareMetalX86Platform, - mkEdgeRawImgType(), - ) - - x86_64.AddImageTypes( - rawUEFIx86Platform, - mkEdgeSimplifiedInstallerImgType(rd), - ) - x86_64.AddImageTypes( azureX64Platform, mkAzureImgType(), ) - aarch64.AddImageTypes( - rawAarch64Platform, - mkEdgeRawImgType(), - mkEdgeSimplifiedInstallerImgType(rd), - ) - aarch64.AddImageTypes( azureAarch64Platform, mkAzureImgType(), diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/distro.go index 3296545..397983b 100644 --- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/distro.go +++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/distro.go @@ -99,59 +99,14 @@ func newDistro(name string, major, minor int) *rhel.Distribution { mkOCIImgType(rd), ) - x86_64.AddImageTypes( - &platform.X86{ - BIOS: true, - UEFIVendor: rd.Vendor(), - BasePlatform: platform.BasePlatform{ - ImageFormat: platform.FORMAT_QCOW2, - }, - }, - mkOpenstackImgType(), - ) - - x86_64.AddImageTypes( - &platform.X86{ - BIOS: true, - UEFIVendor: rd.Vendor(), - BasePlatform: platform.BasePlatform{ - ImageFormat: platform.FORMAT_VMDK, - }, - }, - mkVMDKImgType(), - ) - - x86_64.AddImageTypes( - &platform.X86{ - BIOS: true, - UEFIVendor: rd.Vendor(), - BasePlatform: platform.BasePlatform{ - ImageFormat: platform.FORMAT_OVA, - }, - }, - mkOVAImgType(), - ) - x86_64.AddImageTypes( &platform.X86{}, mkTarImgType(), - mkWSLImgType(), - ) - - aarch64.AddImageTypes( - &platform.Aarch64{ - UEFIVendor: rd.Vendor(), - BasePlatform: platform.BasePlatform{ - ImageFormat: platform.FORMAT_QCOW2, - }, - }, - mkOpenstackImgType(), ) aarch64.AddImageTypes( &platform.Aarch64{}, mkTarImgType(), - mkWSLImgType(), ) aarch64.AddImageTypes( @@ -240,17 +195,6 @@ func newDistro(name string, major, minor int) *rhel.Distribution { aarch64.AddImageTypes(azureAarch64Platform, mkAzureImgType()) } - gceX86Platform := &platform.X86{ - UEFIVendor: rd.Vendor(), - BasePlatform: platform.BasePlatform{ - ImageFormat: platform.FORMAT_GCE, - }, - } - x86_64.AddImageTypes( - gceX86Platform, - mkGCEImageType(), - ) - x86_64.AddImageTypes( &platform.X86{ BasePlatform: platform.BasePlatform{ @@ -271,35 +215,7 @@ func newDistro(name string, major, minor int) *rhel.Distribution { BIOS: true, UEFIVendor: rd.Vendor(), }, - mkEdgeOCIImgType(rd), - mkEdgeCommitImgType(rd), - mkEdgeInstallerImgType(), - mkEdgeRawImgType(rd), mkImageInstallerImgType(), - mkEdgeAMIImgType(rd), - ) - - x86_64.AddImageTypes( - &platform.X86{ - BasePlatform: platform.BasePlatform{ - ImageFormat: platform.FORMAT_VMDK, - }, - BIOS: true, - UEFIVendor: rd.Vendor(), - }, - mkEdgeVsphereImgType(rd), - ) - - x86_64.AddImageTypes( - &platform.X86{ - BasePlatform: platform.BasePlatform{ - ImageFormat: platform.FORMAT_RAW, - }, - BIOS: false, - UEFIVendor: rd.Vendor(), - }, - mkEdgeSimplifiedInstallerImgType(rd), - mkMinimalrawImgType(), ) aarch64.AddImageTypes( @@ -307,33 +223,7 @@ func newDistro(name string, major, minor int) *rhel.Distribution { BasePlatform: platform.BasePlatform{}, UEFIVendor: rd.Vendor(), }, - mkEdgeOCIImgType(rd), - mkEdgeCommitImgType(rd), - mkEdgeInstallerImgType(), - mkEdgeSimplifiedInstallerImgType(rd), mkImageInstallerImgType(), - mkEdgeAMIImgType(rd), - ) - - aarch64.AddImageTypes( - &platform.Aarch64{ - BasePlatform: platform.BasePlatform{ - ImageFormat: platform.FORMAT_VMDK, - }, - UEFIVendor: rd.Vendor(), - }, - mkEdgeVsphereImgType(rd), - ) - - aarch64.AddImageTypes( - &platform.Aarch64{ - BasePlatform: platform.BasePlatform{ - ImageFormat: platform.FORMAT_RAW, - }, - UEFIVendor: rd.Vendor(), - }, - mkEdgeRawImgType(rd), - mkMinimalrawImgType(), ) if rd.IsRHEL() { // RHEL-only (non-CentOS) image types @@ -364,9 +254,6 @@ func newDistro(name string, major, minor int) *rhel.Distribution { }, mkEC2ImgTypeAarch64(rd.OsVersion(), rd.IsRHEL()), ) - - // add GCE RHUI image to RHEL only - x86_64.AddImageTypes(gceX86Platform, mkGCERHUIImageType()) } rd.AddArches(x86_64, aarch64, ppc64le, s390x) -- 2.43.5