Move some defaults and types from config
The params package should not depend on config. The params packages should be consumable by external applications that wish to interact with garm, and it makes no sense to pull in the config package just for some constants. As such, the following changes have been made: * Moved some types from config to params * Moved defaults in a new leaf package called appdefaults Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
This commit is contained in:
parent
086a4564ea
commit
0074af9370
18 changed files with 201 additions and 188 deletions
|
|
@ -17,7 +17,6 @@ package sql
|
|||
import (
|
||||
"time"
|
||||
|
||||
"github.com/cloudbase/garm/config"
|
||||
"github.com/cloudbase/garm/params"
|
||||
"github.com/cloudbase/garm/runner/providers/common"
|
||||
|
||||
|
|
@ -64,8 +63,8 @@ type Pool struct {
|
|||
RunnerBootstrapTimeout uint
|
||||
Image string `gorm:"index:idx_pool_type"`
|
||||
Flavor string `gorm:"index:idx_pool_type"`
|
||||
OSType config.OSType
|
||||
OSArch config.OSArch
|
||||
OSType params.OSType
|
||||
OSArch params.OSArch
|
||||
Tags []*Tag `gorm:"many2many:pool_tags;"`
|
||||
Enabled bool
|
||||
// ExtraSpecs is an opaque json that gets sent to the provider
|
||||
|
|
@ -140,8 +139,8 @@ type Instance struct {
|
|||
ProviderID *string `gorm:"uniqueIndex"`
|
||||
Name string `gorm:"uniqueIndex"`
|
||||
AgentID int64
|
||||
OSType config.OSType
|
||||
OSArch config.OSArch
|
||||
OSType params.OSType
|
||||
OSArch params.OSArch
|
||||
OSName string
|
||||
OSVersion string
|
||||
Addresses []Address `gorm:"foreignKey:InstanceID"`
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue