diff --git a/go.mod b/go.mod index 5d8df8f7ff..cff36d231f 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/containers/psgo v1.8.0 github.com/containers/storage v1.47.0 github.com/coreos/go-systemd/v22 v22.5.0 - github.com/coreos/stream-metadata-go v0.4.2 + github.com/coreos/stream-metadata-go v0.4.3 github.com/crc-org/vfkit v0.0.5-0.20230602131541-3d57f09010c9 github.com/cyphar/filepath-securejoin v0.2.3 github.com/digitalocean/go-qemu v0.0.0-20221209210016-f035778c97f7 diff --git a/go.sum b/go.sum index e75ae4ddce..05cb8f8af6 100644 --- a/go.sum +++ b/go.sum @@ -282,8 +282,8 @@ github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/coreos/stream-metadata-go v0.4.2 h1:A0Ug0Ecb6mlJ5X/tXpBZgZJsA/Ulhj1BR0rEZJMzN4I= -github.com/coreos/stream-metadata-go v0.4.2/go.mod h1:fMObQqQm8Ku91G04btKzEH3AsdP1mrAb986z9aaK0tE= +github.com/coreos/stream-metadata-go v0.4.3 h1:5GykJ8dtZSx1rdlzEAiDVzA73cwmUF3ceTuIP293L6E= +github.com/coreos/stream-metadata-go v0.4.3/go.mod h1:fMObQqQm8Ku91G04btKzEH3AsdP1mrAb986z9aaK0tE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= diff --git a/vendor/github.com/coreos/stream-metadata-go/release/release.go b/vendor/github.com/coreos/stream-metadata-go/release/release.go index 9e60ae8f4e..58642609d0 100644 --- a/vendor/github.com/coreos/stream-metadata-go/release/release.go +++ b/vendor/github.com/coreos/stream-metadata-go/release/release.go @@ -59,6 +59,7 @@ type Media struct { Digitalocean *PlatformBase `json:"digitalocean"` Exoscale *PlatformBase `json:"exoscale"` Gcp *PlatformGcp `json:"gcp"` + HyperV *PlatformBase `json:"hyperv"` Ibmcloud *PlatformIBMCloud `json:"ibmcloud"` KubeVirt *PlatformKubeVirt `json:"kubevirt"` Metal *PlatformBase `json:"metal"` diff --git a/vendor/github.com/coreos/stream-metadata-go/release/translate.go b/vendor/github.com/coreos/stream-metadata-go/release/translate.go index 2bd56beab1..d96c869b20 100644 --- a/vendor/github.com/coreos/stream-metadata-go/release/translate.go +++ b/vendor/github.com/coreos/stream-metadata-go/release/translate.go @@ -102,6 +102,19 @@ func (releaseArch *Arch) toStreamArch(rel *Release) stream.Arch { } } + if releaseArch.Media.Digitalocean != nil { + artifacts["digitalocean"] = stream.PlatformArtifacts{ + Release: rel.Release, + Formats: mapFormats(releaseArch.Media.Digitalocean.Artifacts), + } + + /* We're producing artifacts but they're not yet available + in DigitalOcean as distribution images. + digitalOceanImage := stream.CloudImage{Image: fmt.Sprintf("fedora-coreos-%s", Stream)} + cloudImages.Digitalocean = &digitalOceanImage + */ + } + if releaseArch.Media.Exoscale != nil { artifacts["exoscale"] = stream.PlatformArtifacts{ Release: rel.Release, @@ -109,13 +122,6 @@ func (releaseArch *Arch) toStreamArch(rel *Release) stream.Arch { } } - if releaseArch.Media.Vultr != nil { - artifacts["vultr"] = stream.PlatformArtifacts{ - Release: rel.Release, - Formats: mapFormats(releaseArch.Media.Vultr.Artifacts), - } - } - if releaseArch.Media.Gcp != nil { artifacts["gcp"] = stream.PlatformArtifacts{ Release: rel.Release, @@ -132,31 +138,11 @@ func (releaseArch *Arch) toStreamArch(rel *Release) stream.Arch { } } - if releaseArch.Media.KubeVirt != nil { - artifacts["kubevirt"] = stream.PlatformArtifacts{ + if releaseArch.Media.HyperV != nil { + artifacts["hyperv"] = stream.PlatformArtifacts{ Release: rel.Release, - Formats: mapFormats(releaseArch.Media.KubeVirt.Artifacts), + Formats: mapFormats(releaseArch.Media.HyperV.Artifacts), } - if releaseArch.Media.KubeVirt.Image != nil { - cloudImages.KubeVirt = &stream.ContainerImage{ - Release: rel.Release, - Image: releaseArch.Media.KubeVirt.Image.Image, - DigestRef: releaseArch.Media.KubeVirt.Image.DigestRef, - } - } - } - - if releaseArch.Media.Digitalocean != nil { - artifacts["digitalocean"] = stream.PlatformArtifacts{ - Release: rel.Release, - Formats: mapFormats(releaseArch.Media.Digitalocean.Artifacts), - } - - /* We're producing artifacts but they're not yet available - in DigitalOcean as distribution images. - digitalOceanImage := stream.CloudImage{Image: fmt.Sprintf("fedora-coreos-%s", Stream)} - cloudImages.Digitalocean = &digitalOceanImage - */ } if releaseArch.Media.Ibmcloud != nil { @@ -182,16 +168,26 @@ func (releaseArch *Arch) toStreamArch(rel *Release) stream.Arch { } } - // if releaseArch.Media.Packet != nil { - // packet := StreamMediaDetails{ - // Release: rel.Release, - // Formats: releaseArch.Media.Packet.Artifacts, - // } - // artifacts.Packet = &packet + if releaseArch.Media.KubeVirt != nil { + artifacts["kubevirt"] = stream.PlatformArtifacts{ + Release: rel.Release, + Formats: mapFormats(releaseArch.Media.KubeVirt.Artifacts), + } + if releaseArch.Media.KubeVirt.Image != nil { + cloudImages.KubeVirt = &stream.ContainerImage{ + Release: rel.Release, + Image: releaseArch.Media.KubeVirt.Image.Image, + DigestRef: releaseArch.Media.KubeVirt.Image.DigestRef, + } + } + } - // packetImage := StreamCloudImage{Image: fmt.Sprintf("fedora_coreos_%s", rel.Stream)} - // cloudImages.Packet = &packetImage - // } + if releaseArch.Media.Metal != nil { + artifacts["metal"] = stream.PlatformArtifacts{ + Release: rel.Release, + Formats: mapFormats(releaseArch.Media.Metal.Artifacts), + } + } if releaseArch.Media.Nutanix != nil { artifacts["nutanix"] = stream.PlatformArtifacts{ @@ -207,6 +203,17 @@ func (releaseArch *Arch) toStreamArch(rel *Release) stream.Arch { } } + // if releaseArch.Media.Packet != nil { + // packet := StreamMediaDetails{ + // Release: rel.Release, + // Formats: releaseArch.Media.Packet.Artifacts, + // } + // artifacts.Packet = &packet + + // packetImage := StreamCloudImage{Image: fmt.Sprintf("fedora_coreos_%s", rel.Stream)} + // cloudImages.Packet = &packetImage + // } + if releaseArch.Media.PowerVS != nil { artifacts["powervs"] = stream.PlatformArtifacts{ Release: rel.Release, @@ -258,10 +265,10 @@ func (releaseArch *Arch) toStreamArch(rel *Release) stream.Arch { } } - if releaseArch.Media.Metal != nil { - artifacts["metal"] = stream.PlatformArtifacts{ + if releaseArch.Media.Vultr != nil { + artifacts["vultr"] = stream.PlatformArtifacts{ Release: rel.Release, - Formats: mapFormats(releaseArch.Media.Metal.Artifacts), + Formats: mapFormats(releaseArch.Media.Vultr.Artifacts), } } diff --git a/vendor/modules.txt b/vendor/modules.txt index a7a8b70d8b..5c905494e5 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -355,7 +355,7 @@ github.com/coreos/go-systemd/v22/dbus github.com/coreos/go-systemd/v22/internal/dlopen github.com/coreos/go-systemd/v22/journal github.com/coreos/go-systemd/v22/sdjournal -# github.com/coreos/stream-metadata-go v0.4.2 +# github.com/coreos/stream-metadata-go v0.4.3 ## explicit; go 1.18 github.com/coreos/stream-metadata-go/fedoracoreos github.com/coreos/stream-metadata-go/fedoracoreos/internals