Merge pull request #294 from twelho/runtime-id

Add `runtime.id` for tracking the VM container's ID
weaveworks · Aug 8, 2019 · 0b216e1 · 0b216e1
2 parents 0657c0c + e883d8f
commit 0b216e1
Show file tree

Hide file tree

Showing 10 changed files with 141 additions and 3 deletions.
diff --git a/cmd/ignite-spawn/ignite-spawn.go b/cmd/ignite-spawn/ignite-spawn.go
@@ -100,6 +100,7 @@ func patchStopped(vm *api.VM) error {
  return patchVM(vm, func(patchVM *api.VM) error {
  patchVM.Status.Running = false
  patchVM.Status.IPAddresses = nil
+ patchVM.Status.Runtime = nil
  return nil
  })
 }

diff --git a/docs/api/ignite_v1alpha2.md b/docs/api/ignite_v1alpha2.md
@@ -41,6 +41,7 @@
  - [type PoolDeviceType](#PoolDeviceType)
  - [type PoolSpec](#PoolSpec)
  - [type PoolStatus](#PoolStatus)
+ - [type Runtime](#Runtime)
  - [type SSH](#SSH)
  - [func (s \*SSH) MarshalJSON() (\[\]byte,
  error)](#SSH.MarshalJSON)
@@ -389,6 +390,16 @@ type PoolStatus struct {
 
 PoolStatus defines the Pool’s current status
 
+## <a name="Runtime">type</a> [Runtime](https://github.com/weaveworks/ignite/tree/master/pkg/apis/ignite/v1alpha2/types.go?s=9335:9381#L261)
+
+``` go
+type Runtime struct {
+ ID string `json:"id"`
+}
+```
+
+Runtime specifies the VM’s runtime information
+
 ## <a name="SSH">type</a> [SSH](https://github.com/weaveworks/ignite/tree/master/pkg/apis/ignite/v1alpha2/types.go?s=8705:8782#L238)
 
 ``` go
@@ -485,11 +496,12 @@ type VMSpec struct {
 
 VMSpec describes the configuration of a VM
 
-## <a name="VMStatus">type</a> [VMStatus](https://github.com/weaveworks/ignite/tree/master/pkg/apis/ignite/v1alpha2/types.go?s=9324:9547#L261)
+## <a name="VMStatus">type</a> [VMStatus](https://github.com/weaveworks/ignite/tree/master/pkg/apis/ignite/v1alpha2/types.go?s=9422:9702#L266)
 
 ``` go
 type VMStatus struct {
  Running bool `json:"running"`
+ Runtime *Runtime `json:"runtime,omitempty"`
  IPAddresses meta.IPAddresses `json:"ipAddresses,omitempty"`
  Image OCIImageSource `json:"image"`
  Kernel OCIImageSource `json:"kernel"`

diff --git a/pkg/apis/ignite/types.go b/pkg/apis/ignite/types.go
@@ -257,9 +257,15 @@ const (
  // Whenever updating this list, also update GetNetworkModes in helpers.go
 )
 
+// Runtime specifies the VM's runtime information
+type Runtime struct {
+ ID string `json:"id"`
+}
+
 // VMStatus defines the status of a VM
 type VMStatus struct {
  Running bool `json:"running"`
+ Runtime *Runtime `json:"runtime,omitempty"`
  IPAddresses meta.IPAddresses `json:"ipAddresses,omitempty"`
  Image OCIImageSource `json:"image"`
  Kernel OCIImageSource `json:"kernel"`

diff --git a/pkg/apis/ignite/v1alpha1/zz_generated.conversion.go b/pkg/apis/ignite/v1alpha1/zz_generated.conversion.go
diff --git a/pkg/apis/ignite/v1alpha2/types.go b/pkg/apis/ignite/v1alpha2/types.go
@@ -257,9 +257,15 @@ const (
  // Whenever updating this list, also update GetNetworkModes in helpers.go
 )
 
+// Runtime specifies the VM's runtime information
+type Runtime struct {
+ ID string `json:"id"`
+}
+
 // VMStatus defines the status of a VM
 type VMStatus struct {
  Running bool `json:"running"`
+ Runtime *Runtime `json:"runtime,omitempty"`
  IPAddresses meta.IPAddresses `json:"ipAddresses,omitempty"`
  Image OCIImageSource `json:"image"`
  Kernel OCIImageSource `json:"kernel"`

diff --git a/pkg/apis/ignite/v1alpha2/zz_generated.conversion.go b/pkg/apis/ignite/v1alpha2/zz_generated.conversion.go
diff --git a/pkg/apis/ignite/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/ignite/v1alpha2/zz_generated.deepcopy.go
diff --git a/pkg/apis/ignite/zz_generated.deepcopy.go b/pkg/apis/ignite/zz_generated.deepcopy.go
diff --git a/pkg/openapi/openapi_generated.go b/pkg/openapi/openapi_generated.go
diff --git a/pkg/operations/start.go b/pkg/operations/start.go
@@ -107,6 +107,9 @@ func StartVM(vm *api.VM, debug bool) error {
  return fmt.Errorf("failed to start container for VM %q: %v", vm.GetUID(), err)
  }
 
+ // Set the container ID for the VM
+ vm.Status.Runtime = &api.Runtime{ID: containerID}
+
  if vm.Spec.Network.Mode == api.NetworkModeCNI {
  if err := providers.NetworkPlugin.SetupContainerNetwork(containerID); err != nil {
  return err
@@ -120,7 +123,16 @@ func StartVM(vm *api.VM, debug bool) error {
  // TODO: Follow-up the container here with a defer, or dedicated goroutine. We should output
  // if it started successfully or not
  // TODO: This is temporary until we have proper communication to the container
- return waitForSpawn(vm)
+ if err := waitForSpawn(vm); err != nil {
+ return err
+ }
+
+ // TODO: Enable this when ignite-spawn doesn't write to the file anymore
+ //if err := providers.Client.VMs().Set(vm); err != nil {
+ // return err
+ //}
+
+ return nil
 }
 
 func verifyPulled(image string) error {