Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 26 additions & 23 deletions gangplank/cosa/cosa_v1.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ type Build struct {
FedoraCoreOsParentVersion string `json:"fedora-coreos.parent-version,omitempty"`
Gcp *Gcp `json:"gcp,omitempty"`
GitDirty string `json:"coreos-assembler.config-dirty,omitempty"`
IbmCloud *Cloudartifact `json:"ibmcloud,omitempty"`
ImageInputChecksum string `json:"coreos-assembler.image-input-checksum,omitempty"`
InputHasOfTheRpmOstree string `json:"rpm-ostree-inputhash"`
Koji *Koji `json:"koji,omitempty"`
Expand All @@ -69,33 +70,35 @@ type Build struct {
OverridesActive bool `json:"coreos-assembler.overrides-active,omitempty"`
PkgdiffAgainstParent PackageSetDifferences `json:"parent-pkgdiff,omitempty"`
PkgdiffBetweenBuilds PackageSetDifferences `json:"pkgdiff,omitempty"`
PowerVirtualServer *Cloudartifact `json:"powervs,omitempty"`
ReleasePayload *Image `json:"release-payload,omitempty"`
}

type BuildArtifacts struct {
Aliyun *Artifact `json:"aliyun,omitempty"`
Aws *Artifact `json:"aws,omitempty"`
Azure *Artifact `json:"azure,omitempty"`
AzureStack *Artifact `json:"azurestack,omitempty"`
Dasd *Artifact `json:"dasd,omitempty"`
DigitalOcean *Artifact `json:"digitalocean,omitempty"`
Exoscale *Artifact `json:"exoscale,omitempty"`
Gcp *Artifact `json:"gcp,omitempty"`
IbmCloud *Artifact `json:"ibmcloud,omitempty"`
Initramfs *Artifact `json:"initramfs,omitempty"`
Iso *Artifact `json:"iso,omitempty"`
Kernel *Artifact `json:"kernel,omitempty"`
LiveInitramfs *Artifact `json:"live-initramfs,omitempty"`
LiveIso *Artifact `json:"live-iso,omitempty"`
LiveKernel *Artifact `json:"live-kernel,omitempty"`
LiveRootfs *Artifact `json:"live-rootfs,omitempty"`
Metal *Artifact `json:"metal,omitempty"`
Metal4KNative *Artifact `json:"metal4k,omitempty"`
OpenStack *Artifact `json:"openstack,omitempty"`
Ostree Artifact `json:"ostree"`
Qemu *Artifact `json:"qemu,omitempty"`
Vmware *Artifact `json:"vmware,omitempty"`
Vultr *Artifact `json:"vultr,omitempty"`
Aliyun *Artifact `json:"aliyun,omitempty"`
Aws *Artifact `json:"aws,omitempty"`
Azure *Artifact `json:"azure,omitempty"`
AzureStack *Artifact `json:"azurestack,omitempty"`
Dasd *Artifact `json:"dasd,omitempty"`
DigitalOcean *Artifact `json:"digitalocean,omitempty"`
Exoscale *Artifact `json:"exoscale,omitempty"`
Gcp *Artifact `json:"gcp,omitempty"`
IbmCloud *Artifact `json:"ibmcloud,omitempty"`
Initramfs *Artifact `json:"initramfs,omitempty"`
Iso *Artifact `json:"iso,omitempty"`
Kernel *Artifact `json:"kernel,omitempty"`
LiveInitramfs *Artifact `json:"live-initramfs,omitempty"`
LiveIso *Artifact `json:"live-iso,omitempty"`
LiveKernel *Artifact `json:"live-kernel,omitempty"`
LiveRootfs *Artifact `json:"live-rootfs,omitempty"`
Metal *Artifact `json:"metal,omitempty"`
Metal4KNative *Artifact `json:"metal4k,omitempty"`
OpenStack *Artifact `json:"openstack,omitempty"`
Ostree Artifact `json:"ostree"`
PowerVirtualServer *Artifact `json:"powervs,omitempty"`
Qemu *Artifact `json:"qemu,omitempty"`
Vmware *Artifact `json:"vmware,omitempty"`
Vultr *Artifact `json:"vultr,omitempty"`
}

type Cloudartifact struct {
Expand Down
49 changes: 26 additions & 23 deletions mantle/cosa/cosa_v1.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ type Build struct {
FedoraCoreOsParentVersion string `json:"fedora-coreos.parent-version,omitempty"`
Gcp *Gcp `json:"gcp,omitempty"`
GitDirty string `json:"coreos-assembler.config-dirty,omitempty"`
IbmCloud *Cloudartifact `json:"ibmcloud,omitempty"`
ImageInputChecksum string `json:"coreos-assembler.image-input-checksum,omitempty"`
InputHasOfTheRpmOstree string `json:"rpm-ostree-inputhash"`
Koji *Koji `json:"koji,omitempty"`
Expand All @@ -69,33 +70,35 @@ type Build struct {
OverridesActive bool `json:"coreos-assembler.overrides-active,omitempty"`
PkgdiffAgainstParent PackageSetDifferences `json:"parent-pkgdiff,omitempty"`
PkgdiffBetweenBuilds PackageSetDifferences `json:"pkgdiff,omitempty"`
PowerVirtualServer *Cloudartifact `json:"powervs,omitempty"`
ReleasePayload *Image `json:"release-payload,omitempty"`
}

type BuildArtifacts struct {
Aliyun *Artifact `json:"aliyun,omitempty"`
Aws *Artifact `json:"aws,omitempty"`
Azure *Artifact `json:"azure,omitempty"`
AzureStack *Artifact `json:"azurestack,omitempty"`
Dasd *Artifact `json:"dasd,omitempty"`
DigitalOcean *Artifact `json:"digitalocean,omitempty"`
Exoscale *Artifact `json:"exoscale,omitempty"`
Gcp *Artifact `json:"gcp,omitempty"`
IbmCloud *Artifact `json:"ibmcloud,omitempty"`
Initramfs *Artifact `json:"initramfs,omitempty"`
Iso *Artifact `json:"iso,omitempty"`
Kernel *Artifact `json:"kernel,omitempty"`
LiveInitramfs *Artifact `json:"live-initramfs,omitempty"`
LiveIso *Artifact `json:"live-iso,omitempty"`
LiveKernel *Artifact `json:"live-kernel,omitempty"`
LiveRootfs *Artifact `json:"live-rootfs,omitempty"`
Metal *Artifact `json:"metal,omitempty"`
Metal4KNative *Artifact `json:"metal4k,omitempty"`
OpenStack *Artifact `json:"openstack,omitempty"`
Ostree Artifact `json:"ostree"`
Qemu *Artifact `json:"qemu,omitempty"`
Vmware *Artifact `json:"vmware,omitempty"`
Vultr *Artifact `json:"vultr,omitempty"`
Aliyun *Artifact `json:"aliyun,omitempty"`
Aws *Artifact `json:"aws,omitempty"`
Azure *Artifact `json:"azure,omitempty"`
AzureStack *Artifact `json:"azurestack,omitempty"`
Dasd *Artifact `json:"dasd,omitempty"`
DigitalOcean *Artifact `json:"digitalocean,omitempty"`
Exoscale *Artifact `json:"exoscale,omitempty"`
Gcp *Artifact `json:"gcp,omitempty"`
IbmCloud *Artifact `json:"ibmcloud,omitempty"`
Initramfs *Artifact `json:"initramfs,omitempty"`
Iso *Artifact `json:"iso,omitempty"`
Kernel *Artifact `json:"kernel,omitempty"`
LiveInitramfs *Artifact `json:"live-initramfs,omitempty"`
LiveIso *Artifact `json:"live-iso,omitempty"`
LiveKernel *Artifact `json:"live-kernel,omitempty"`
LiveRootfs *Artifact `json:"live-rootfs,omitempty"`
Metal *Artifact `json:"metal,omitempty"`
Metal4KNative *Artifact `json:"metal4k,omitempty"`
OpenStack *Artifact `json:"openstack,omitempty"`
Ostree Artifact `json:"ostree"`
PowerVirtualServer *Artifact `json:"powervs,omitempty"`
Qemu *Artifact `json:"qemu,omitempty"`
Vmware *Artifact `json:"vmware,omitempty"`
Vultr *Artifact `json:"vultr,omitempty"`
}

type Cloudartifact struct {
Expand Down
20 changes: 20 additions & 0 deletions mantle/cosa/schema_doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ var generatedSchemaJSON = `{
"exoscale",
"gcp",
"ibmcloud",
"powervs",

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the past we have discussed the naming of a platform at a community meeting. COSA usually has used the agreed upon name for Ignition and Afterburn (cc @bgilbert). Digging around the docs [1] I found references to cloud-init which begs the question if we're going to need Ignition and Afterburn support down the line.

[1] https://www.ibm.com/docs/en/powervc/1.4.0?topic=machine-installing-configuring-cloud-init

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We've already discussed the platform in a community meeting. See coreos/fedora-coreos-tracker#817 for more.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes. also with regards to Afterburn there will be a new powervs provider added which will be similar to ibmcloud_classic.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"images",
"koji",
"oscontainer",
Expand Down Expand Up @@ -380,6 +381,7 @@ var generatedSchemaJSON = `{
"exoscale",
"gcp",
"ibmcloud",
"powervs",
"initramfs",
"iso",
"kernel",
Expand Down Expand Up @@ -527,6 +529,12 @@ var generatedSchemaJSON = `{
"title":"IBM Cloud",
"$ref": "#/definitions/artifact"
},
"powervs": {
"$id":"#/properties/images/properties/powervs",
"type":"object",
"title":"Power Virtual Server",
"$ref": "#/definitions/artifact"
},
"gcp": {
"$id":"#/properties/images/properties/gcp",
"type":"object",
Expand Down Expand Up @@ -797,6 +805,18 @@ var generatedSchemaJSON = `{
}
}
},
"ibmcloud": {
"$id":"#/properties/ibmcloud",
"type":"object",
"title":"IBM Cloud",
"$ref": "#/definitions/cloudartifact"
},
"powervs": {
"$id":"#/properties/powervs",
"type":"object",
"title":"Power Virtual Server",
"$ref": "#/definitions/cloudartifact"
},
"release-payload": {
"$id":"#/properties/release-payload",
"type":"object",
Expand Down
20 changes: 20 additions & 0 deletions src/schema/v1.json
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@
"exoscale",
"gcp",
"ibmcloud",
"powervs",
"images",
"koji",
"oscontainer",
Expand Down Expand Up @@ -375,6 +376,7 @@
"exoscale",
"gcp",
"ibmcloud",
"powervs",
"initramfs",
"iso",
"kernel",
Expand Down Expand Up @@ -522,6 +524,12 @@
"title":"IBM Cloud",
"$ref": "#/definitions/artifact"
},
"powervs": {
"$id":"#/properties/images/properties/powervs",
"type":"object",
"title":"Power Virtual Server",
"$ref": "#/definitions/artifact"
},
"gcp": {
"$id":"#/properties/images/properties/gcp",
"type":"object",
Expand Down Expand Up @@ -792,6 +800,18 @@
}
}
},
"ibmcloud": {
"$id":"#/properties/ibmcloud",
"type":"object",
"title":"IBM Cloud",
"$ref": "#/definitions/cloudartifact"
},
"powervs": {
"$id":"#/properties/powervs",
"type":"object",
"title":"Power Virtual Server",
"$ref": "#/definitions/cloudartifact"
},
"release-payload": {
"$id":"#/properties/release-payload",
"type":"object",
Expand Down