Merge branch 'master' into pkg-runtime, fix blank lines in all imports

# Conflicts: # cmd/ignite/run/create.go # cmd/ignite/run/images.go # cmd/ignite/run/inspect.go # cmd/ignite/run/kernels.go # cmd/ignite/run/ps.go # pkg/metadata/imgmd/imgmd.go # pkg/metadata/kernmd/kernmd.go # pkg/metadata/metadata.go # pkg/operations/start.go # pkg/source/docker.go
weaveworks · Jul 18, 2019 · 6478c65 · 6478c65
2 parents 425e87b + b573a49
commit 6478c65
Show file tree

Hide file tree

Showing 64 changed files with 1,782 additions and 238 deletions.
diff --git a/Makefile b/Makefile
@@ -10,7 +10,7 @@ IS_DIRTY:=$(shell echo ${GIT_VERSION} | grep -o dirty | wc -l)
 WHAT?=ignite
 PROJECT = github.com/weaveworks/ignite
 APIS_DIR = ${PROJECT}/pkg/apis
-API_DIRS = ${APIS_DIR}/ignite/v1alpha1,${APIS_DIR}/meta/v1alpha1
+API_DIRS = ${APIS_DIR}/ignite,${APIS_DIR}/ignite/v1alpha1,${APIS_DIR}/meta/v1alpha1
 CACHE_DIR = $(shell pwd)/bin/cache
 API_DOCS = api/ignite.md api/meta.md
 

diff --git a/README.md b/README.md
@@ -163,7 +163,7 @@ See the [FAQ.md](FAQ.md) document.
 Want to know how Ignite really works under the hood?
 Check out this [TGIK](https://github.com/heptio/tgik) session from [Joe Beda](https://twitter.com/jbeda) about it:
 
-[[![TGIK 082](https://img.youtube.com/vi/aq-wlslJ5MQ/0.jpg)]](https://youtu.be/aq-wlslJ5MQ)
+[![TGIK 082](https://img.youtube.com/vi/aq-wlslJ5MQ/0.jpg)](https://youtu.be/aq-wlslJ5MQ)
 
 ### Base images and kernels
 

diff --git 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 @@
 
 
 #### <a name="pkg-files">Package files</a>
-[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) 
 
 
 ## <a name="pkg-constants">Constants</a>
 ``` 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)
 ```
 
 
-## <a name="ValidateNetworkMode">func</a> [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
-
-
-
 
 ## <a name="FileMapping">type</a> [FileMapping](/pkg/apis/ignite/v1alpha1/types.go?s=7677:7772#L206)
 ``` go
@@ -364,13 +343,6 @@ const (
 
 
 
-### <a name="GetNetworkModes">func</a> [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
 
 
 
-### <a name="VM.SetImage">func</a> (\*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
-
-
-
-
-### <a name="VM.SetKernel">func</a> (\*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
-
-
-
-
 ## <a name="VMImageSpec">type</a> [VMImageSpec](/pkg/apis/ignite/v1alpha1/types.go?s=7298:7367#L191)
 ``` go
 type VMImageSpec struct {

diff --git a/cmd/ignite-spawn/ignite-spawn.go b/cmd/ignite-spawn/ignite-spawn.go
@@ -5,15 +5,13 @@ import (
 	"os"
 	"path"
 
-	"github.com/weaveworks/ignite/pkg/providers"
-
-	"github.com/weaveworks/ignite/pkg/constants"
-
 	log "github.com/sirupsen/logrus"
-	api "github.com/weaveworks/ignite/pkg/apis/ignite/v1alpha1"
+	api "github.com/weaveworks/ignite/pkg/apis/ignite"
+	"github.com/weaveworks/ignite/pkg/constants"
 	"github.com/weaveworks/ignite/pkg/container"
 	"github.com/weaveworks/ignite/pkg/container/prometheus"
 	"github.com/weaveworks/ignite/pkg/logs"
+	"github.com/weaveworks/ignite/pkg/providers"
 )
 
 func main() {

diff --git a/cmd/ignite/cmd/cmdutil/flags.go b/cmd/ignite/cmd/cmdutil/flags.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/pflag"
-	api "github.com/weaveworks/ignite/pkg/apis/ignite/v1alpha1"
+	api "github.com/weaveworks/ignite/pkg/apis/ignite"
 	meta "github.com/weaveworks/ignite/pkg/apis/meta/v1alpha1"
 	"github.com/weaveworks/ignite/pkg/util"
 )
@@ -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/cmd/gitops.go b/cmd/ignite/cmd/gitops.go
@@ -4,7 +4,6 @@ import (
 	"io"
 
 	"github.com/lithammer/dedent"
-
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"github.com/weaveworks/ignite/pkg/errutils"

diff --git a/cmd/ignite/cmd/kerncmd/kernel.go b/cmd/ignite/cmd/kerncmd/kernel.go
@@ -4,7 +4,6 @@ import (
 	"io"
 
 	"github.com/lithammer/dedent"
-
 	"github.com/spf13/cobra"
 	"github.com/weaveworks/ignite/cmd/ignite/run"
 	"github.com/weaveworks/ignite/pkg/errutils"

diff --git a/cmd/ignite/cmd/logs.go b/cmd/ignite/cmd/logs.go
@@ -3,9 +3,8 @@ package cmd
 import (
 	"io"
 
-	"github.com/weaveworks/ignite/cmd/ignite/cmd/vmcmd"
-
 	"github.com/spf13/cobra"
+	"github.com/weaveworks/ignite/cmd/ignite/cmd/vmcmd"
 )
 
 // NewCmdLogs is an alias for vmcmd.NewCmdLogs

diff --git a/cmd/ignite/cmd/version.go b/cmd/ignite/cmd/version.go
@@ -3,9 +3,8 @@ package cmd
 import (
 	"io"
 
-	"github.com/weaveworks/ignite/cmd/ignite/run"
-
 	"github.com/spf13/cobra"
+	"github.com/weaveworks/ignite/cmd/ignite/run"
 	"github.com/weaveworks/ignite/pkg/errutils"
 )
 

diff --git a/cmd/ignite/cmd/vmcmd/create.go b/cmd/ignite/cmd/vmcmd/create.go
@@ -4,13 +4,12 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/weaveworks/ignite/pkg/constants"
-
 	"github.com/lithammer/dedent"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"github.com/weaveworks/ignite/cmd/ignite/cmd/cmdutil"
 	"github.com/weaveworks/ignite/cmd/ignite/run"
+	"github.com/weaveworks/ignite/pkg/constants"
 	"github.com/weaveworks/ignite/pkg/errutils"
 )
 

diff --git a/cmd/ignite/ignite.go b/cmd/ignite/ignite.go
@@ -4,9 +4,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/weaveworks/ignite/pkg/providers"
-
 	"github.com/weaveworks/ignite/cmd/ignite/cmd"
+	"github.com/weaveworks/ignite/pkg/providers"
 )
 
 func main() {

diff --git a/cmd/ignite/run/create.go b/cmd/ignite/run/create.go
@@ -5,24 +5,23 @@ import (
 	"path"
 	"strings"
 
-	"github.com/weaveworks/ignite/pkg/providers"
-
+	api "github.com/weaveworks/ignite/pkg/apis/ignite"
 	"github.com/weaveworks/ignite/pkg/apis/ignite/scheme"
-	api "github.com/weaveworks/ignite/pkg/apis/ignite/v1alpha1"
 	meta "github.com/weaveworks/ignite/pkg/apis/meta/v1alpha1"
 	"github.com/weaveworks/ignite/pkg/metadata"
 	"github.com/weaveworks/ignite/pkg/metadata/imgmd"
 	"github.com/weaveworks/ignite/pkg/metadata/kernmd"
 	"github.com/weaveworks/ignite/pkg/metadata/vmmd"
 	"github.com/weaveworks/ignite/pkg/operations"
+	"github.com/weaveworks/ignite/pkg/providers"
 )
 
 func NewCreateFlags() *CreateFlags {
 	cf := &CreateFlags{
 		VM: &api.VM{},
 	}
 
-	scheme.Scheme.Default(cf.VM)
+	scheme.Serializer.DefaultInternal(cf.VM)
 
 	return cf
 }
@@ -97,8 +96,8 @@ func (cf *CreateFlags) NewCreateOptions(args []string) (*createOptions, error) {
 
 	co := &createOptions{CreateFlags: cf}
 
-	var err 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)
 	if err != nil {
 		return nil, err

diff --git a/cmd/ignite/run/images.go b/cmd/ignite/run/images.go
@@ -1,7 +1,7 @@
 package run
 
 import (
-	api "github.com/weaveworks/ignite/pkg/apis/ignite/v1alpha1"
+	api "github.com/weaveworks/ignite/pkg/apis/ignite"
 	"github.com/weaveworks/ignite/pkg/filter"
 	"github.com/weaveworks/ignite/pkg/providers"
 	"github.com/weaveworks/ignite/pkg/util"

diff --git a/cmd/ignite/run/inspect.go b/cmd/ignite/run/inspect.go
@@ -5,12 +5,11 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/weaveworks/ignite/pkg/providers"
-
+	api "github.com/weaveworks/ignite/pkg/apis/ignite"
 	"github.com/weaveworks/ignite/pkg/apis/ignite/scheme"
-	api "github.com/weaveworks/ignite/pkg/apis/ignite/v1alpha1"
 	meta "github.com/weaveworks/ignite/pkg/apis/meta/v1alpha1"
 	"github.com/weaveworks/ignite/pkg/filter"
+	"github.com/weaveworks/ignite/pkg/providers"
 )
 
 type InspectFlags struct {

diff --git a/cmd/ignite/run/kernels.go b/cmd/ignite/run/kernels.go
@@ -1,7 +1,7 @@
 package run
 
 import (
-	api "github.com/weaveworks/ignite/pkg/apis/ignite/v1alpha1"
+	api "github.com/weaveworks/ignite/pkg/apis/ignite"
 	"github.com/weaveworks/ignite/pkg/filter"
 	"github.com/weaveworks/ignite/pkg/providers"
 	"github.com/weaveworks/ignite/pkg/util"

diff --git a/cmd/ignite/run/logs.go b/cmd/ignite/run/logs.go
@@ -4,9 +4,8 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"github.com/weaveworks/ignite/pkg/providers"
-
 	"github.com/weaveworks/ignite/pkg/metadata/vmmd"
+	"github.com/weaveworks/ignite/pkg/providers"
 	"github.com/weaveworks/ignite/pkg/util"
 )
 

diff --git a/cmd/ignite/run/ps.go b/cmd/ignite/run/ps.go
@@ -1,7 +1,7 @@
 package run
 
 import (
-	api "github.com/weaveworks/ignite/pkg/apis/ignite/v1alpha1"
+	api "github.com/weaveworks/ignite/pkg/apis/ignite"
 	"github.com/weaveworks/ignite/pkg/filter"
 	"github.com/weaveworks/ignite/pkg/providers"
 	"github.com/weaveworks/ignite/pkg/util"

diff --git a/cmd/ignite/run/rm.go b/cmd/ignite/run/rm.go
@@ -3,10 +3,9 @@ package run
 import (
 	"fmt"
 
-	"github.com/weaveworks/ignite/pkg/providers"
-
 	"github.com/weaveworks/ignite/pkg/metadata/vmmd"
 	"github.com/weaveworks/ignite/pkg/operations"
+	"github.com/weaveworks/ignite/pkg/providers"
 )
 
 type RmFlags struct {

diff --git a/cmd/ignite/run/rmi.go b/cmd/ignite/run/rmi.go
@@ -4,11 +4,10 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/weaveworks/ignite/pkg/providers"
-
 	"github.com/weaveworks/ignite/pkg/filter"
 	"github.com/weaveworks/ignite/pkg/metadata/imgmd"
 	"github.com/weaveworks/ignite/pkg/metadata/vmmd"
+	"github.com/weaveworks/ignite/pkg/providers"
 )
 
 type RmiFlags struct {

diff --git a/cmd/ignite/run/rmk.go b/cmd/ignite/run/rmk.go
@@ -4,12 +4,10 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/weaveworks/ignite/pkg/providers"
-
 	"github.com/weaveworks/ignite/pkg/filter"
-
 	"github.com/weaveworks/ignite/pkg/metadata/kernmd"
 	"github.com/weaveworks/ignite/pkg/metadata/vmmd"
+	"github.com/weaveworks/ignite/pkg/providers"
 )
 
 type RmkFlags struct {

diff --git a/cmd/ignite/run/ssh.go b/cmd/ignite/run/ssh.go
@@ -5,7 +5,6 @@ import (
 	"path"
 
 	log "github.com/sirupsen/logrus"
-
 	"github.com/weaveworks/ignite/pkg/constants"
 	"github.com/weaveworks/ignite/pkg/metadata/vmmd"
 	"github.com/weaveworks/ignite/pkg/util"