Merge pull request #311 from twelho/spec-oci-redesign

OCIImageClaim -> OCIRef, simplify by naming the field `oci`

cmd/ignite/cmd/vmcmd/create.go

@@ -74,7 +74,7 @@ func addCreateFlags(fs *pflag.FlagSet, cf *run.CreateFlags) {
  // Register more complex flags with their own flag types
  cmdutil.SizeVar(fs, &cf.VM.Spec.Memory, "memory", "Amount of RAM to allocate for the VM")
  cmdutil.SizeVarP(fs, &cf.VM.Spec.DiskSize, "size", "s", "VM filesystem size, for example 5GB or 2048MB")
- cmdutil.OCIImageRefVarP(fs, &cf.VM.Spec.Kernel.OCIClaim.Ref, "kernel-image", "k", "Specify an OCI image containing the kernel at /boot/vmlinux and optionally, modules")
+ cmdutil.OCIImageRefVarP(fs, &cf.VM.Spec.Kernel.OCI, "kernel-image", "k", "Specify an OCI image containing the kernel at /boot/vmlinux and optionally, modules")
  cmdutil.NetworkModeVar(fs, &cf.VM.Spec.Network.Mode)
  cmdutil.SSHVar(fs, &cf.SSH)
  cmdutil.VolumeVarP(fs, &cf.VM.Spec.Storage, "volumes", "v", "Expose block devices from the host inside the VM")

cmd/ignite/run/create.go

@@ -46,7 +46,7 @@ func (cf *CreateFlags) constructVMFromCLI(args []string) error {
  return err
  }
 
- cf.VM.Spec.Image.OCIClaim.Ref = ociRef
+ cf.VM.Spec.Image.OCI = ociRef
  }
 
  // Parse the --copy-files flag
@@ -91,7 +91,7 @@ func (cf *CreateFlags) NewCreateOptions(args []string) (*createOptions, error) {
 
  // Get the image, or import it if it doesn't exist
  var err error
- co.image, err = operations.FindOrImportImage(providers.Client, cf.VM.Spec.Image.OCIClaim.Ref)
+ co.image, err = operations.FindOrImportImage(providers.Client, cf.VM.Spec.Image.OCI)
  if err != nil {
  return nil, err
  }
@@ -100,7 +100,7 @@ func (cf *CreateFlags) NewCreateOptions(args []string) (*createOptions, error) {
  cf.VM.SetImage(co.image)
 
  // Get the kernel, or import it if it doesn't exist
- co.kernel, err = operations.FindOrImportKernel(providers.Client, cf.VM.Spec.Kernel.OCIClaim.Ref)
+ co.kernel, err = operations.FindOrImportKernel(providers.Client, cf.VM.Spec.Kernel.OCI)
  if err != nil {
  return nil, err
  }

cmd/ignite/run/ps.go

@@ -30,7 +30,7 @@ func Ps(po *psOptions) error {
 
  o.Write("VM ID", "IMAGE", "KERNEL", "SIZE", "CPUS", "MEMORY", "CREATED", "STATUS", "IPS", "PORTS", "NAME")
  for _, vm := range po.allVMs {
- o.Write(vm.GetUID(), vm.Spec.Image.OCIClaim.Ref, vm.Spec.Kernel.OCIClaim.Ref,
+ o.Write(vm.GetUID(), vm.Spec.Image.OCI, vm.Spec.Kernel.OCI,
  vm.Spec.DiskSize, vm.Spec.CPUs, vm.Spec.Memory, vm.GetCreated(), formatStatus(vm), vm.Status.IPAddresses,
  vm.Spec.Network.Ports, vm.GetName())
  }

docs/api/ignite_v1alpha1.md

@@ -15,21 +15,51 @@
 
  - [Constants](#pkg-constants)
  - [Variables](#pkg-variables)
+ - [func Convert\_ignite\_ImageSpec\_To\_v1alpha1\_ImageSpec(in
+ *ignite.ImageSpec, out *ImageSpec, s conversion.Scope)
+ error](#Convert_ignite_ImageSpec_To_v1alpha1_ImageSpec)
+ - [func Convert\_ignite\_KernelSpec\_To\_v1alpha1\_KernelSpec(in
+ *ignite.KernelSpec, out *KernelSpec, s conversion.Scope)
+ error](#Convert_ignite_KernelSpec_To_v1alpha1_KernelSpec)
  - [func
  Convert\_ignite\_OCIImageSource\_To\_v1alpha1\_OCIImageSource(in
  *ignite.OCIImageSource, out *OCIImageSource, s conversion.Scope)
  error](#Convert_ignite_OCIImageSource_To_v1alpha1_OCIImageSource)
+ - [func Convert\_ignite\_OCI\_To\_v1alpha1\_OCIClaim(in
+ *meta.OCIImageRef, out *OCIImageClaim)
+ error](#Convert_ignite_OCI_To_v1alpha1_OCIClaim)
+ - [func Convert\_ignite\_VMImageSpec\_To\_v1alpha1\_VMImageSpec(in
+ *ignite.VMImageSpec, out *VMImageSpec, s conversion.Scope)
+ error](#Convert_ignite_VMImageSpec_To_v1alpha1_VMImageSpec)
+ - [func Convert\_ignite\_VMKernelSpec\_To\_v1alpha1\_VMKernelSpec(in
+ *ignite.VMKernelSpec, out *VMKernelSpec, s conversion.Scope)
+ error](#Convert_ignite_VMKernelSpec_To_v1alpha1_VMKernelSpec)
  - [func Convert\_ignite\_VMSpec\_To\_v1alpha1\_VMSpec(in
  *ignite.VMSpec, out *VMSpec, s conversion.Scope)
  error](#Convert_ignite_VMSpec_To_v1alpha1_VMSpec)
  - [func Convert\_ignite\_VMStatus\_To\_v1alpha1\_VMStatus(in
  *ignite.VMStatus, out *VMStatus, s conversion.Scope)
  error](#Convert_ignite_VMStatus_To_v1alpha1_VMStatus)
+ - [func Convert\_v1alpha1\_ImageSpec\_To\_ignite\_ImageSpec(in
+ *ImageSpec, out *ignite.ImageSpec, s conversion.Scope)
+ error](#Convert_v1alpha1_ImageSpec_To_ignite_ImageSpec)
+ - [func Convert\_v1alpha1\_KernelSpec\_To\_ignite\_KernelSpec(in
+ *KernelSpec, out *ignite.KernelSpec, s conversion.Scope)
+ error](#Convert_v1alpha1_KernelSpec_To_ignite_KernelSpec)
+ - [func Convert\_v1alpha1\_OCIClaim\_To\_ignite\_OCI(in
+ *OCIImageClaim, out *meta.OCIImageRef)
+ error](#Convert_v1alpha1_OCIClaim_To_ignite_OCI)
  - [func
  Convert\_v1alpha1\_OCIImageSource\_To\_ignite\_OCIImageSource(in
  *OCIImageSource, out *ignite.OCIImageSource, s conversion.Scope)
  (err
  error)](#Convert_v1alpha1_OCIImageSource_To_ignite_OCIImageSource)
+ - [func Convert\_v1alpha1\_VMImageSpec\_To\_ignite\_VMImageSpec(in
+ *VMImageSpec, out *ignite.VMImageSpec, s conversion.Scope)
+ error](#Convert_v1alpha1_VMImageSpec_To_ignite_VMImageSpec)
+ - [func Convert\_v1alpha1\_VMKernelSpec\_To\_ignite\_VMKernelSpec(in
+ *VMKernelSpec, out *ignite.VMKernelSpec, s conversion.Scope)
+ error](#Convert_v1alpha1_VMKernelSpec_To_ignite_VMKernelSpec)
  - [func Convert\_v1alpha1\_VMSpec\_To\_ignite\_VMSpec(in *VMSpec, out
  *ignite.VMSpec, s conversion.Scope)
  error](#Convert_v1alpha1_VMSpec_To_ignite_VMSpec)
@@ -124,6 +154,24 @@ var SchemeGroupVersion = schema.GroupVersion{
 
 SchemeGroupVersion is group version used to register these objects
 
+## <a name="Convert_ignite_ImageSpec_To_v1alpha1_ImageSpec">func</a> [Convert\_ignite\_ImageSpec\_To\_v1alpha1\_ImageSpec](https://github.com/weaveworks/ignite/tree/master/pkg/apis/ignite/v1alpha1/conversion.go?s=4265:4380#L107)
+
+``` go
+func Convert_ignite_ImageSpec_To_v1alpha1_ImageSpec(in *ignite.ImageSpec, out *ImageSpec, s conversion.Scope) error
+```
+
+Convert\_ignite\_ImageSpec\_To\_v1alpha1\_ImageSpec calls the
+autogenerated conversion function along with custom conversion logic
+
+## <a name="Convert_ignite_KernelSpec_To_v1alpha1_KernelSpec">func</a> [Convert\_ignite\_KernelSpec\_To\_v1alpha1\_KernelSpec](https://github.com/weaveworks/ignite/tree/master/pkg/apis/ignite/v1alpha1/conversion.go?s=5121:5240#L125)
+
+``` go
+func Convert_ignite_KernelSpec_To_v1alpha1_KernelSpec(in *ignite.KernelSpec, out *KernelSpec, s conversion.Scope) error
+```
+
+Convert\_ignite\_KernelSpec\_To\_v1alpha1\_KernelSpec calls the
+autogenerated conversion function along with custom conversion logic
+
 ## <a name="Convert_ignite_OCIImageSource_To_v1alpha1_OCIImageSource">func</a> [Convert\_ignite\_OCIImageSource\_To\_v1alpha1\_OCIImageSource](https://github.com/weaveworks/ignite/tree/master/pkg/apis/ignite/v1alpha1/conversion.go?s=2032:2167#L50)
 
 ``` go
@@ -133,6 +181,30 @@ func Convert_ignite_OCIImageSource_To_v1alpha1_OCIImageSource(in *ignite.OCIImag
 Convert\_ignite\_OCIImageSource\_To\_v1alpha1\_OCIImageSource calls the
 autogenerated conversion function along with custom conversion logic
 
+## <a name="Convert_ignite_OCI_To_v1alpha1_OCIClaim">func</a> [Convert\_ignite\_OCI\_To\_v1alpha1\_OCIClaim](https://github.com/weaveworks/ignite/tree/master/pkg/apis/ignite/v1alpha1/conversion.go?s=3825:3917#L96)
+
+``` go
+func Convert_ignite_OCI_To_v1alpha1_OCIClaim(in *meta.OCIImageRef, out *OCIImageClaim) error
+```
+
+## <a name="Convert_ignite_VMImageSpec_To_v1alpha1_VMImageSpec">func</a> [Convert\_ignite\_VMImageSpec\_To\_v1alpha1\_VMImageSpec](https://github.com/weaveworks/ignite/tree/master/pkg/apis/ignite/v1alpha1/conversion.go?s=5993:6116#L143)
+
+``` go
+func Convert_ignite_VMImageSpec_To_v1alpha1_VMImageSpec(in *ignite.VMImageSpec, out *VMImageSpec, s conversion.Scope) error
+```
+
+Convert\_ignite\_VMImageSpec\_To\_v1alpha1\_VMImageSpec calls the
+autogenerated conversion function along with custom conversion logic
+
+## <a name="Convert_ignite_VMKernelSpec_To_v1alpha1_VMKernelSpec">func</a> [Convert\_ignite\_VMKernelSpec\_To\_v1alpha1\_VMKernelSpec](https://github.com/weaveworks/ignite/tree/master/pkg/apis/ignite/v1alpha1/conversion.go?s=6881:7008#L161)
+
+``` go
+func Convert_ignite_VMKernelSpec_To_v1alpha1_VMKernelSpec(in *ignite.VMKernelSpec, out *VMKernelSpec, s conversion.Scope) error
+```
+
+Convert\_ignite\_VMKernelSpec\_To\_v1alpha1\_VMKernelSpec calls the
+autogenerated conversion function along with custom conversion logic
+
 ## <a name="Convert_ignite_VMSpec_To_v1alpha1_VMSpec">func</a> [Convert\_ignite\_VMSpec\_To\_v1alpha1\_VMSpec](https://github.com/weaveworks/ignite/tree/master/pkg/apis/ignite/v1alpha1/conversion.go?s=299:402#L10)
 
 ``` go
@@ -151,6 +223,30 @@ func Convert_ignite_VMStatus_To_v1alpha1_VMStatus(in *ignite.VMStatus, out *VMSt
 Convert\_ignite\_VMStatus\_To\_v1alpha1\_VMStatus calls the
 autogenerated conversion function along with custom conversion logic
 
+## <a name="Convert_v1alpha1_ImageSpec_To_ignite_ImageSpec">func</a> [Convert\_v1alpha1\_ImageSpec\_To\_ignite\_ImageSpec](https://github.com/weaveworks/ignite/tree/master/pkg/apis/ignite/v1alpha1/conversion.go?s=4692:4807#L116)
+
+``` go
+func Convert_v1alpha1_ImageSpec_To_ignite_ImageSpec(in *ImageSpec, out *ignite.ImageSpec, s conversion.Scope) error
+```
+
+Convert\_v1alpha1\_ImageSpec\_To\_ignite\_ImageSpec calls the
+autogenerated conversion function along with custom conversion logic
+
+## <a name="Convert_v1alpha1_KernelSpec_To_ignite_KernelSpec">func</a> [Convert\_v1alpha1\_KernelSpec\_To\_ignite\_KernelSpec](https://github.com/weaveworks/ignite/tree/master/pkg/apis/ignite/v1alpha1/conversion.go?s=5556:5675#L134)
+
+``` go
+func Convert_v1alpha1_KernelSpec_To_ignite_KernelSpec(in *KernelSpec, out *ignite.KernelSpec, s conversion.Scope) error
+```
+
+Convert\_v1alpha1\_KernelSpec\_To\_ignite\_KernelSpec calls the
+autogenerated conversion function along with custom conversion logic
+
+## <a name="Convert_v1alpha1_OCIClaim_To_ignite_OCI">func</a> [Convert\_v1alpha1\_OCIClaim\_To\_ignite\_OCI](https://github.com/weaveworks/ignite/tree/master/pkg/apis/ignite/v1alpha1/conversion.go?s=3592:3684#L88)
+
+``` go
+func Convert_v1alpha1_OCIClaim_To_ignite_OCI(in *OCIImageClaim, out *meta.OCIImageRef) error
+```
+
 ## <a name="Convert_v1alpha1_OCIImageSource_To_ignite_OCIImageSource">func</a> [Convert\_v1alpha1\_OCIImageSource\_To\_ignite\_OCIImageSource](https://github.com/weaveworks/ignite/tree/master/pkg/apis/ignite/v1alpha1/conversion.go?s=2775:2916#L68)
 
 ``` go
@@ -160,6 +256,24 @@ func Convert_v1alpha1_OCIImageSource_To_ignite_OCIImageSource(in *OCIImageSource
 Convert\_v1alpha1\_OCIImageSource\_To\_ignite\_OCIImageSource calls the
 autogenerated conversion function along with custom conversion logic
 
+## <a name="Convert_v1alpha1_VMImageSpec_To_ignite_VMImageSpec">func</a> [Convert\_v1alpha1\_VMImageSpec\_To\_ignite\_VMImageSpec](https://github.com/weaveworks/ignite/tree/master/pkg/apis/ignite/v1alpha1/conversion.go?s=6436:6559#L152)
+
+``` go
+func Convert_v1alpha1_VMImageSpec_To_ignite_VMImageSpec(in *VMImageSpec, out *ignite.VMImageSpec, s conversion.Scope) error
+```
+
+Convert\_v1alpha1\_VMImageSpec\_To\_ignite\_VMImageSpec calls the
+autogenerated conversion function along with custom conversion logic
+
+## <a name="Convert_v1alpha1_VMKernelSpec_To_ignite_VMKernelSpec">func</a> [Convert\_v1alpha1\_VMKernelSpec\_To\_ignite\_VMKernelSpec](https://github.com/weaveworks/ignite/tree/master/pkg/apis/ignite/v1alpha1/conversion.go?s=7332:7459#L170)
+
+``` go
+func Convert_v1alpha1_VMKernelSpec_To_ignite_VMKernelSpec(in *VMKernelSpec, out *ignite.VMKernelSpec, s conversion.Scope) error
+```
+
+Convert\_v1alpha1\_VMKernelSpec\_To\_ignite\_VMKernelSpec calls the
+autogenerated conversion function along with custom conversion logic
+
 ## <a name="Convert_v1alpha1_VMSpec_To_ignite_VMSpec">func</a> [Convert\_v1alpha1\_VMSpec\_To\_ignite\_VMSpec](https://github.com/weaveworks/ignite/tree/master/pkg/apis/ignite/v1alpha1/conversion.go?s=697:800#L16)
 
 ``` go