From 4997cf18eee6f9cbd256c43c131186e5d5665762 Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Mon, 7 Nov 2022 22:25:58 +0000 Subject: [PATCH] Fixup duplicated crd def --- api/v1alpha1/osartifact_types.go | 2 +- ...facts.yaml => build.kairos.io_osartifacts.yaml} | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) rename config/crd/bases/{build.c3os-x.io_osartifacts.yaml => build.kairos.io_osartifacts.yaml} (89%) diff --git a/api/v1alpha1/osartifact_types.go b/api/v1alpha1/osartifact_types.go index 298224a..a2ff806 100644 --- a/api/v1alpha1/osartifact_types.go +++ b/api/v1alpha1/osartifact_types.go @@ -40,7 +40,7 @@ type OSArtifactSpec struct { GCEImage bool `json:"gceImage,omitempty"` Netboot bool `json:"netboot,omitempty"` - NetbootURL string `json:"netboot_url",omitempty` + NetbootURL string `json:"netbootURL,omitempty"` // TODO: treat cloudconfig as a secret, and take a secretRef where to store it (optionally) CloudConfig string `json:"cloudConfig,omitempty"` diff --git a/config/crd/bases/build.c3os-x.io_osartifacts.yaml b/config/crd/bases/build.kairos.io_osartifacts.yaml similarity index 89% rename from config/crd/bases/build.c3os-x.io_osartifacts.yaml rename to config/crd/bases/build.kairos.io_osartifacts.yaml index f64d57d..d3eb6c1 100644 --- a/config/crd/bases/build.c3os-x.io_osartifacts.yaml +++ b/config/crd/bases/build.kairos.io_osartifacts.yaml @@ -35,6 +35,8 @@ spec: spec: description: OSArtifactSpec defines the desired state of OSArtifact properties: + azureImage: + type: boolean bundles: items: type: string @@ -43,6 +45,13 @@ spec: description: 'TODO: treat cloudconfig as a secret, and take a secretRef where to store it (optionally)' type: string + cloudImage: + type: boolean + diskSize: + description: Disk-only stuff + type: string + gceImage: + type: boolean grubConfig: type: string imageName: @@ -50,7 +59,12 @@ spec: to remove/update type: string iso: + description: This needs to be revisited type: boolean + netboot: + type: boolean + netbootURL: + type: string osRelease: type: string pull: