Skip to content
This repository has been archived by the owner on Dec 7, 2023. It is now read-only.

Client and Storage rework: Recognize multiple API groups #221

Merged
merged 5 commits into from
Jul 19, 2019
Merged

Client and Storage rework: Recognize multiple API groups #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0236b2e
Rework the storage layer to track schema.GroupVersionKind instead of …
luxas Jul 18, 2019
8ef7193
Utilize the new .New method in storage, and propagate that through th…
luxas Jul 18, 2019
c0d95d9
A couple of improvements in storage; automatically default in the ser…
luxas Jul 18, 2019
5aa5d6d
Adapt the rest of the application to these new features in the client…
luxas Jul 18, 2019
d5fce2a
autogenerated
luxas Jul 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 6 additions & 29 deletions api/ignite.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,8 @@
## <a name="pkg-index">Index</a>
* [Constants](#pkg-constants)
* [Variables](#pkg-variables)
* [func SetDefaults_Image(obj *Image)](#SetDefaults_Image)
* [func SetDefaults_Kernel(obj *Kernel)](#SetDefaults_Kernel)
* [func SetDefaults_OCIImageClaim(obj *OCIImageClaim)](#SetDefaults_OCIImageClaim)
* [func SetDefaults_PoolSpec(obj *PoolSpec)](#SetDefaults_PoolSpec)
* [func SetDefaults_VM(obj *VM)](#SetDefaults_VM)
* [func SetDefaults_VMKernelSpec(obj *VMKernelSpec)](#SetDefaults_VMKernelSpec)
* [func SetDefaults_VMNetworkSpec(obj *VMNetworkSpec)](#SetDefaults_VMNetworkSpec)
* [func SetDefaults_VMSpec(obj *VMSpec)](#SetDefaults_VMSpec)
Expand Down Expand Up @@ -97,57 +94,37 @@ SchemeGroupVersion is group version used to register these objects



## <a name="SetDefaults_Image">func</a> [SetDefaults_Image](/pkg/apis/ignite/v1alpha1/defaults.go?s=2218:2252#L91)
``` go
func SetDefaults_Image(obj *Image)
```


## <a name="SetDefaults_Kernel">func</a> [SetDefaults_Kernel](/pkg/apis/ignite/v1alpha1/defaults.go?s=2276:2312#L95)
``` go
func SetDefaults_Kernel(obj *Kernel)
```


## <a name="SetDefaults_OCIImageClaim">func</a> [SetDefaults_OCIImageClaim](/pkg/apis/ignite/v1alpha1/defaults.go?s=275:325#L15)
## <a name="SetDefaults_OCIImageClaim">func</a> [SetDefaults_OCIImageClaim](/pkg/apis/ignite/v1alpha1/defaults.go?s=263:313#L13)
``` go
func SetDefaults_OCIImageClaim(obj *OCIImageClaim)
```


## <a name="SetDefaults_PoolSpec">func</a> [SetDefaults_PoolSpec](/pkg/apis/ignite/v1alpha1/defaults.go?s=365:405#L19)
## <a name="SetDefaults_PoolSpec">func</a> [SetDefaults_PoolSpec](/pkg/apis/ignite/v1alpha1/defaults.go?s=353:393#L17)
``` go
func SetDefaults_PoolSpec(obj *PoolSpec)
```


## <a name="SetDefaults_VM">func</a> [SetDefaults_VM](/pkg/apis/ignite/v1alpha1/defaults.go?s=2166:2194#L87)
``` go
func SetDefaults_VM(obj *VM)
```
TODO: Temporary hacks to populate TypeMeta until we get the generator working



## <a name="SetDefaults_VMKernelSpec">func</a> [SetDefaults_VMKernelSpec](/pkg/apis/ignite/v1alpha1/defaults.go?s=1247:1295#L55)
## <a name="SetDefaults_VMKernelSpec">func</a> [SetDefaults_VMKernelSpec](/pkg/apis/ignite/v1alpha1/defaults.go?s=1235:1283#L53)
``` go
func SetDefaults_VMKernelSpec(obj *VMKernelSpec)
```


## <a name="SetDefaults_VMNetworkSpec">func</a> [SetDefaults_VMNetworkSpec](/pkg/apis/ignite/v1alpha1/defaults.go?s=1532:1582#L66)
## <a name="SetDefaults_VMNetworkSpec">func</a> [SetDefaults_VMNetworkSpec](/pkg/apis/ignite/v1alpha1/defaults.go?s=1520:1570#L64)
``` go
func SetDefaults_VMNetworkSpec(obj *VMNetworkSpec)
```


## <a name="SetDefaults_VMSpec">func</a> [SetDefaults_VMSpec](/pkg/apis/ignite/v1alpha1/defaults.go?s=931:967#L41)
## <a name="SetDefaults_VMSpec">func</a> [SetDefaults_VMSpec](/pkg/apis/ignite/v1alpha1/defaults.go?s=919:955#L39)
``` go
func SetDefaults_VMSpec(obj *VMSpec)
```


## <a name="SetDefaults_VMStatus">func</a> [SetDefaults_VMStatus](/pkg/apis/ignite/v1alpha1/defaults.go?s=1653:1693#L72)
## <a name="SetDefaults_VMStatus">func</a> [SetDefaults_VMStatus](/pkg/apis/ignite/v1alpha1/defaults.go?s=1641:1681#L70)
``` go
func SetDefaults_VMStatus(obj *VMStatus)
```
Expand Down
66 changes: 42 additions & 24 deletions api/meta.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@
* [type TypeMeta](#TypeMeta)
* [func (t *TypeMeta) GetKind() Kind](#TypeMeta.GetKind)
* [func (t *TypeMeta) GetTypeMeta() *TypeMeta](#TypeMeta.GetTypeMeta)
* [func (t *TypeMeta) GroupVersionKind() schema.GroupVersionKind](#TypeMeta.GroupVersionKind)
* [func (t *TypeMeta) SetGroupVersionKind(gvk schema.GroupVersionKind)](#TypeMeta.SetGroupVersionKind)
* [type UID](#UID)
* [func (u UID) String() string](#UID.String)
* [func (u *UID) UnmarshalJSON(b []byte) error](#UID.UnmarshalJSON)
Expand All @@ -90,7 +92,7 @@ var EmptySize = NewSizeFromBytes(0)



## <a name="APIType">type</a> [APIType](/pkg/apis/meta/v1alpha1/meta.go?s=411:495#L19)
## <a name="APIType">type</a> [APIType](/pkg/apis/meta/v1alpha1/meta.go?s=453:537#L20)
``` go
type APIType struct {
*TypeMeta `json:",inline"`
Expand All @@ -109,14 +111,14 @@ where .Name, .UID, .Kind and .APIVersion become easily available



### <a name="APITypeFrom">func</a> [APITypeFrom](/pkg/apis/meta/v1alpha1/meta.go?s=705:742#L33)
### <a name="APITypeFrom">func</a> [APITypeFrom](/pkg/apis/meta/v1alpha1/meta.go?s=747:784#L34)
``` go
func APITypeFrom(obj Object) *APIType
```
APITypeFrom is used to create a bound APIType from an Object


### <a name="NewAPIType">func</a> [NewAPIType](/pkg/apis/meta/v1alpha1/meta.go?s=556:582#L25)
### <a name="NewAPIType">func</a> [NewAPIType](/pkg/apis/meta/v1alpha1/meta.go?s=598:624#L26)
``` go
func NewAPIType() *APIType
```
Expand All @@ -126,7 +128,7 @@ This constructor ensures the APIType fields are not nil



## <a name="APITypeList">type</a> [APITypeList](/pkg/apis/meta/v1alpha1/meta.go?s=898:925#L43)
## <a name="APITypeList">type</a> [APITypeList](/pkg/apis/meta/v1alpha1/meta.go?s=940:967#L44)
``` go
type APITypeList []*APIType
```
Expand Down Expand Up @@ -212,7 +214,7 @@ func (i IPAddresses) String() string



## <a name="Kind">type</a> [Kind](/pkg/apis/meta/v1alpha1/meta.go?s=1218:1234#L59)
## <a name="Kind">type</a> [Kind](/pkg/apis/meta/v1alpha1/meta.go?s=1507:1523#L68)
``` go
type Kind string
```
Expand All @@ -225,7 +227,7 @@ type Kind string



### <a name="Kind.Lower">func</a> (Kind) [Lower](/pkg/apis/meta/v1alpha1/meta.go?s=1644:1672#L81)
### <a name="Kind.Lower">func</a> (Kind) [Lower](/pkg/apis/meta/v1alpha1/meta.go?s=1933:1961#L90)
``` go
func (k Kind) Lower() string
```
Expand All @@ -234,7 +236,7 @@ Returns a lowercase string representation of the Kind



### <a name="Kind.String">func</a> (Kind) [String](/pkg/apis/meta/v1alpha1/meta.go?s=1337:1366#L64)
### <a name="Kind.String">func</a> (Kind) [String](/pkg/apis/meta/v1alpha1/meta.go?s=1626:1655#L73)
``` go
func (k Kind) String() string
```
Expand All @@ -243,7 +245,7 @@ Returns a string representation of the Kind suitable for sentences



### <a name="Kind.Title">func</a> (Kind) [Title](/pkg/apis/meta/v1alpha1/meta.go?s=1535:1563#L76)
### <a name="Kind.Title">func</a> (Kind) [Title](/pkg/apis/meta/v1alpha1/meta.go?s=1824:1852#L85)
``` go
func (k Kind) Title() string
```
Expand Down Expand Up @@ -300,7 +302,7 @@ func (i *OCIImageRef) UnmarshalJSON(b []byte) error



## <a name="Object">type</a> [Object](/pkg/apis/meta/v1alpha1/meta.go?s=3724:4069#L165)
## <a name="Object">type</a> [Object](/pkg/apis/meta/v1alpha1/meta.go?s=4013:4448#L174)
``` go
type Object interface {
runtime.Object
Expand All @@ -309,6 +311,8 @@ type Object interface {
GetObjectMeta() *ObjectMeta

GetKind() Kind
GroupVersionKind() schema.GroupVersionKind
SetGroupVersionKind(schema.GroupVersionKind)

GetName() string
SetName(string)
Expand Down Expand Up @@ -338,7 +342,7 @@ extra GetName() and GetUID() methods from ObjectMeta



## <a name="ObjectMeta">type</a> [ObjectMeta](/pkg/apis/meta/v1alpha1/meta.go?s=1879:2171#L88)
## <a name="ObjectMeta">type</a> [ObjectMeta](/pkg/apis/meta/v1alpha1/meta.go?s=2168:2460#L97)
``` go
type ObjectMeta struct {
Name string `json:"name"`
Expand All @@ -362,7 +366,7 @@ implement the Object interface



### <a name="ObjectMeta.GetAnnotation">func</a> (\*ObjectMeta) [GetAnnotation](/pkg/apis/meta/v1alpha1/meta.go?s=3279:3332#L148)
### <a name="ObjectMeta.GetAnnotation">func</a> (\*ObjectMeta) [GetAnnotation](/pkg/apis/meta/v1alpha1/meta.go?s=3568:3621#L157)
``` go
func (o *ObjectMeta) GetAnnotation(key string) string
```
Expand All @@ -371,7 +375,7 @@ GetAnnotation returns the label value for the key



### <a name="ObjectMeta.GetCreated">func</a> (\*ObjectMeta) [GetCreated](/pkg/apis/meta/v1alpha1/meta.go?s=2716:2754#L122)
### <a name="ObjectMeta.GetCreated">func</a> (\*ObjectMeta) [GetCreated](/pkg/apis/meta/v1alpha1/meta.go?s=3005:3043#L131)
``` go
func (o *ObjectMeta) GetCreated() Time
```
Expand All @@ -380,7 +384,7 @@ GetCreated returns when the Object was created



### <a name="ObjectMeta.GetLabel">func</a> (\*ObjectMeta) [GetLabel](/pkg/apis/meta/v1alpha1/meta.go?s=2937:2985#L132)
### <a name="ObjectMeta.GetLabel">func</a> (\*ObjectMeta) [GetLabel](/pkg/apis/meta/v1alpha1/meta.go?s=3226:3274#L141)
``` go
func (o *ObjectMeta) GetLabel(key string) string
```
Expand All @@ -389,7 +393,7 @@ GetLabel returns the label value for the key



### <a name="ObjectMeta.GetName">func</a> (\*ObjectMeta) [GetName](/pkg/apis/meta/v1alpha1/meta.go?s=2322:2359#L102)
### <a name="ObjectMeta.GetName">func</a> (\*ObjectMeta) [GetName](/pkg/apis/meta/v1alpha1/meta.go?s=2611:2648#L111)
``` go
func (o *ObjectMeta) GetName() string
```
Expand All @@ -398,7 +402,7 @@ GetName returns the name of the Object



### <a name="ObjectMeta.GetObjectMeta">func</a> (\*ObjectMeta) [GetObjectMeta](/pkg/apis/meta/v1alpha1/meta.go?s=2216:2264#L97)
### <a name="ObjectMeta.GetObjectMeta">func</a> (\*ObjectMeta) [GetObjectMeta](/pkg/apis/meta/v1alpha1/meta.go?s=2505:2553#L106)
``` go
func (o *ObjectMeta) GetObjectMeta() *ObjectMeta
```
Expand All @@ -407,7 +411,7 @@ This is a helper for APIType generation



### <a name="ObjectMeta.GetUID">func</a> (\*ObjectMeta) [GetUID](/pkg/apis/meta/v1alpha1/meta.go?s=2521:2554#L112)
### <a name="ObjectMeta.GetUID">func</a> (\*ObjectMeta) [GetUID](/pkg/apis/meta/v1alpha1/meta.go?s=2810:2843#L121)
``` go
func (o *ObjectMeta) GetUID() UID
```
Expand All @@ -416,7 +420,7 @@ GetUID returns the UID of the Object



### <a name="ObjectMeta.SetAnnotation">func</a> (\*ObjectMeta) [SetAnnotation](/pkg/apis/meta/v1alpha1/meta.go?s=3453:3506#L156)
### <a name="ObjectMeta.SetAnnotation">func</a> (\*ObjectMeta) [SetAnnotation](/pkg/apis/meta/v1alpha1/meta.go?s=3742:3795#L165)
``` go
func (o *ObjectMeta) SetAnnotation(key, value string)
```
Expand All @@ -425,7 +429,7 @@ SetAnnotation sets a label value for a key



### <a name="ObjectMeta.SetCreated">func</a> (\*ObjectMeta) [SetCreated](/pkg/apis/meta/v1alpha1/meta.go?s=2829:2868#L127)
### <a name="ObjectMeta.SetCreated">func</a> (\*ObjectMeta) [SetCreated](/pkg/apis/meta/v1alpha1/meta.go?s=3118:3157#L136)
``` go
func (o *ObjectMeta) SetCreated(t Time)
```
Expand All @@ -434,7 +438,7 @@ SetCreated sets the creation time of the Object



### <a name="ObjectMeta.SetLabel">func</a> (\*ObjectMeta) [SetLabel](/pkg/apis/meta/v1alpha1/meta.go?s=3091:3139#L140)
### <a name="ObjectMeta.SetLabel">func</a> (\*ObjectMeta) [SetLabel](/pkg/apis/meta/v1alpha1/meta.go?s=3380:3428#L149)
``` go
func (o *ObjectMeta) SetLabel(key, value string)
```
Expand All @@ -443,7 +447,7 @@ SetLabel sets a label value for a key



### <a name="ObjectMeta.SetName">func</a> (\*ObjectMeta) [SetName](/pkg/apis/meta/v1alpha1/meta.go?s=2419:2460#L107)
### <a name="ObjectMeta.SetName">func</a> (\*ObjectMeta) [SetName](/pkg/apis/meta/v1alpha1/meta.go?s=2708:2749#L116)
``` go
func (o *ObjectMeta) SetName(name string)
```
Expand All @@ -452,7 +456,7 @@ SetName sets the name of the Object



### <a name="ObjectMeta.SetUID">func</a> (\*ObjectMeta) [SetUID](/pkg/apis/meta/v1alpha1/meta.go?s=2611:2647#L117)
### <a name="ObjectMeta.SetUID">func</a> (\*ObjectMeta) [SetUID](/pkg/apis/meta/v1alpha1/meta.go?s=2900:2936#L126)
``` go
func (o *ObjectMeta) SetUID(uid UID)
```
Expand Down Expand Up @@ -639,7 +643,7 @@ The default string for Time is a human readable difference between the Time and



## <a name="TypeMeta">type</a> [TypeMeta](/pkg/apis/meta/v1alpha1/meta.go?s=1014:1055#L46)
## <a name="TypeMeta">type</a> [TypeMeta](/pkg/apis/meta/v1alpha1/meta.go?s=1056:1097#L47)
``` go
type TypeMeta struct {
metav1.TypeMeta
Expand All @@ -657,14 +661,14 @@ TypeMeta is an alias for the k8s/apimachinery TypeMeta with some additional meth



### <a name="TypeMeta.GetKind">func</a> (\*TypeMeta) [GetKind](/pkg/apis/meta/v1alpha1/meta.go?s=1158:1191#L55)
### <a name="TypeMeta.GetKind">func</a> (\*TypeMeta) [GetKind](/pkg/apis/meta/v1alpha1/meta.go?s=1200:1233#L56)
``` go
func (t *TypeMeta) GetKind() Kind
```



### <a name="TypeMeta.GetTypeMeta">func</a> (\*TypeMeta) [GetTypeMeta](/pkg/apis/meta/v1alpha1/meta.go?s=1100:1142#L51)
### <a name="TypeMeta.GetTypeMeta">func</a> (\*TypeMeta) [GetTypeMeta](/pkg/apis/meta/v1alpha1/meta.go?s=1142:1184#L52)
``` go
func (t *TypeMeta) GetTypeMeta() *TypeMeta
```
Expand All @@ -673,6 +677,20 @@ This is a helper for APIType generation



### <a name="TypeMeta.GroupVersionKind">func</a> (\*TypeMeta) [GroupVersionKind](/pkg/apis/meta/v1alpha1/meta.go?s=1260:1321#L60)
``` go
func (t *TypeMeta) GroupVersionKind() schema.GroupVersionKind
```



### <a name="TypeMeta.SetGroupVersionKind">func</a> (\*TypeMeta) [SetGroupVersionKind](/pkg/apis/meta/v1alpha1/meta.go?s=1381:1448#L64)
``` go
func (t *TypeMeta) SetGroupVersionKind(gvk schema.GroupVersionKind)
```



## <a name="UID">type</a> [UID](/pkg/apis/meta/v1alpha1/uid.go?s=153:168#L12)
``` go
type UID string
Expand Down
8 changes: 2 additions & 6 deletions cmd/ignite/run/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,9 @@ import (
)

func NewCreateFlags() *CreateFlags {
cf := &CreateFlags{
VM: &api.VM{},
return &CreateFlags{
VM: client.VMs().New(),
}

scheme.Serializer.DefaultInternal(cf.VM)

return cf
}

type CreateFlags struct {
Expand Down
20 changes: 0 additions & 20 deletions pkg/apis/ignite/v1alpha1/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package v1alpha1

import (
"reflect"

meta "github.com/weaveworks/ignite/pkg/apis/meta/v1alpha1"
"github.com/weaveworks/ignite/pkg/constants"
"k8s.io/apimachinery/pkg/runtime"
Expand Down Expand Up @@ -82,21 +80,3 @@ func calcMetadataDevSize(obj *PoolSpec) meta.Size {

return meta.NewSizeFromBytes(48 * obj.DataSize.Bytes() / obj.AllocationSize.Bytes()).Min(maxSize).Max(minSize)
}

// TODO: Temporary hacks to populate TypeMeta until we get the generator working
func SetDefaults_VM(obj *VM) {
setTypeMeta(obj)
}

func SetDefaults_Image(obj *Image) {
setTypeMeta(obj)
}

func SetDefaults_Kernel(obj *Kernel) {
setTypeMeta(obj)
}

func setTypeMeta(obj meta.Object) {
obj.GetTypeMeta().APIVersion = SchemeGroupVersion.String()
obj.GetTypeMeta().Kind = reflect.Indirect(reflect.ValueOf(obj)).Type().Name()
}
3 changes: 0 additions & 3 deletions pkg/apis/ignite/v1alpha1/zz_generated.defaults.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading