diff --git a/api/ignite.md b/api/ignite.md
index 597aece47..815b804c8 100644
--- a/api/ignite.md
+++ b/api/ignite.md
@@ -10,6 +10,7 @@
+k8s:deepcopy-gen=package
+k8s:defaulter-gen=TypeMeta
+k8s:openapi-gen=true
++k8s:conversion-gen=github.com/weaveworks/ignite/pkg/apis/ignite
@@ -26,7 +27,6 @@
* [func SetDefaults_VMNetworkSpec(obj *VMNetworkSpec)](#SetDefaults_VMNetworkSpec)
* [func SetDefaults_VMSpec(obj *VMSpec)](#SetDefaults_VMSpec)
* [func SetDefaults_VMStatus(obj *VMStatus)](#SetDefaults_VMStatus)
-* [func ValidateNetworkMode(mode NetworkMode) error](#ValidateNetworkMode)
* [type FileMapping](#FileMapping)
* [type Image](#Image)
* [type ImageSourceType](#ImageSourceType)
@@ -36,7 +36,6 @@
* [type KernelSpec](#KernelSpec)
* [type KernelStatus](#KernelStatus)
* [type NetworkMode](#NetworkMode)
- * [func GetNetworkModes() []NetworkMode](#GetNetworkModes)
* [func (nm NetworkMode) String() string](#NetworkMode.String)
* [type OCIImageClaim](#OCIImageClaim)
* [type OCIImageSource](#OCIImageSource)
@@ -49,8 +48,6 @@
* [func (s *SSH) MarshalJSON() ([]byte, error)](#SSH.MarshalJSON)
* [func (s *SSH) UnmarshalJSON(b []byte) error](#SSH.UnmarshalJSON)
* [type VM](#VM)
- * [func (vm *VM) SetImage(image *Image)](#VM.SetImage)
- * [func (vm *VM) SetKernel(kernel *Kernel)](#VM.SetKernel)
* [type VMImageSpec](#VMImageSpec)
* [type VMKernelSpec](#VMKernelSpec)
* [type VMNetworkSpec](#VMNetworkSpec)
@@ -60,30 +57,21 @@
#### Package files
-[defaults.go](/pkg/apis/ignite/v1alpha1/defaults.go) [doc.go](/pkg/apis/ignite/v1alpha1/doc.go) [helpers.go](/pkg/apis/ignite/v1alpha1/helpers.go) [json.go](/pkg/apis/ignite/v1alpha1/json.go) [register.go](/pkg/apis/ignite/v1alpha1/register.go) [types.go](/pkg/apis/ignite/v1alpha1/types.go)
+[defaults.go](/pkg/apis/ignite/v1alpha1/defaults.go) [doc.go](/pkg/apis/ignite/v1alpha1/doc.go) [json.go](/pkg/apis/ignite/v1alpha1/json.go) [register.go](/pkg/apis/ignite/v1alpha1/register.go) [types.go](/pkg/apis/ignite/v1alpha1/types.go)
## Constants
``` go
const (
- // GroupName is the group name use in this package
- GroupName = "ignite.weave.works"
-
- // VMKind returns the kind for the VM API type
- VMKind = "VM"
- // KernelKind returns the kind for the Kernel API type
- KernelKind = "Kernel"
- // PoolKind returns the kind for the Pool API type
- PoolKind = "Pool"
- // ImageKind returns the kind for the Image API type
- ImageKind = "Image"
+ KindImage meta.Kind = "Image"
+ KindKernel meta.Kind = "Kernel"
+ KindVM meta.Kind = "VM"
)
```
``` go
const (
- KindImage meta.Kind = "Image"
- KindKernel meta.Kind = "Kernel"
- KindVM meta.Kind = "VM"
+ // GroupName is the group name use in this package
+ GroupName = "ignite.weave.works"
)
```
@@ -165,15 +153,6 @@ func SetDefaults_VMStatus(obj *VMStatus)
```
-## func [ValidateNetworkMode](/pkg/apis/ignite/v1alpha1/helpers.go?s=317:365#L15)
-``` go
-func ValidateNetworkMode(mode NetworkMode) error
-```
-ValidateNetworkMode validates the network mode
-TODO: This should move into a dedicated validation package
-
-
-
## type [FileMapping](/pkg/apis/ignite/v1alpha1/types.go?s=7677:7772#L206)
``` go
@@ -364,13 +343,6 @@ const (
-### func [GetNetworkModes](/pkg/apis/ignite/v1alpha1/helpers.go?s=92:128#L6)
-``` go
-func GetNetworkModes() []NetworkMode
-```
-GetNetworkModes gets the list of available network modes
-
-
@@ -615,24 +587,6 @@ These files are stored in /var/lib/firecracker/vm/{vm-id}/metadata.json
-### func (\*VM) [SetImage](/pkg/apis/ignite/v1alpha1/helpers.go?s=658:694#L30)
-``` go
-func (vm *VM) SetImage(image *Image)
-```
-SetImage populates relevant fields to an Image on the VM object
-
-
-
-
-### func (\*VM) [SetKernel](/pkg/apis/ignite/v1alpha1/helpers.go?s=856:895#L36)
-``` go
-func (vm *VM) SetKernel(kernel *Kernel)
-```
-SetKernel populates relevant fields to a Kernel on the VM object
-
-
-
-
## type [VMImageSpec](/pkg/apis/ignite/v1alpha1/types.go?s=7298:7367#L191)
``` go
type VMImageSpec struct {
diff --git a/cmd/ignite/cmd/cmdutil/flags.go b/cmd/ignite/cmd/cmdutil/flags.go
index f7294030a..48f616ca0 100644
--- a/cmd/ignite/cmd/cmdutil/flags.go
+++ b/cmd/ignite/cmd/cmdutil/flags.go
@@ -119,11 +119,7 @@ type NetworkModeFlag struct {
}
func (nf *NetworkModeFlag) Set(val string) error {
- nm := api.NetworkMode(val)
- if err := api.ValidateNetworkMode(nm); err != nil {
- return err
- }
- *nf.value = nm
+ *nf.value = api.NetworkMode(val)
return nil
}
diff --git a/cmd/ignite/run/create.go b/cmd/ignite/run/create.go
index 78a016d11..3aff53b30 100644
--- a/cmd/ignite/run/create.go
+++ b/cmd/ignite/run/create.go
@@ -5,8 +5,8 @@ import (
"path"
"strings"
- "github.com/weaveworks/ignite/pkg/apis/ignite/scheme"
api "github.com/weaveworks/ignite/pkg/apis/ignite"
+ "github.com/weaveworks/ignite/pkg/apis/ignite/scheme"
meta "github.com/weaveworks/ignite/pkg/apis/meta/v1alpha1"
"github.com/weaveworks/ignite/pkg/client"
"github.com/weaveworks/ignite/pkg/metadata"
diff --git a/cmd/ignite/run/inspect.go b/cmd/ignite/run/inspect.go
index b189929f5..98603fc50 100644
--- a/cmd/ignite/run/inspect.go
+++ b/cmd/ignite/run/inspect.go
@@ -5,8 +5,8 @@ import (
"fmt"
"strings"
- "github.com/weaveworks/ignite/pkg/apis/ignite/scheme"
api "github.com/weaveworks/ignite/pkg/apis/ignite"
+ "github.com/weaveworks/ignite/pkg/apis/ignite/scheme"
meta "github.com/weaveworks/ignite/pkg/apis/meta/v1alpha1"
"github.com/weaveworks/ignite/pkg/client"
"github.com/weaveworks/ignite/pkg/filter"
diff --git a/docs/dependencies.svg b/docs/dependencies.svg
index 28e2be7fa..1c3f9bcb8 100644
--- a/docs/dependencies.svg
+++ b/docs/dependencies.svg
@@ -1,4348 +1,4348 @@
-
-