1
0
mirror of https://github.com/rancher/types.git synced 2025-07-31 04:49:37 +00:00

improve catalog status

This commit is contained in:
Daishan Peng 2018-04-19 11:50:37 -07:00 committed by Darren Shepherd
parent 733076a260
commit fc11044fd9
4 changed files with 5 additions and 5 deletions

View File

@ -71,16 +71,13 @@ type TemplateSpec struct {
CatalogID string `json:"catalogId,omitempty" norman:"type=reference[catalog]"`
DefaultTemplateVersionID string `json:"defaultTemplateVersionId,omitempty" norman:"type=reference[templateVersion]"`
IsSystem string `json:"isSystem,omitempty"`
Description string `json:"description,omitempty"`
DefaultVersion string `json:"defaultVersion,omitempty" yaml:"default_version,omitempty"`
Path string `json:"path,omitempty"`
Maintainer string `json:"maintainer,omitempty"`
License string `json:"license,omitempty"`
ProjectURL string `json:"projectURL,omitempty" yaml:"project_url,omitempty"`
UpgradeFrom string `json:"upgradeFrom,omitempty"`
FolderName string `json:"folderName,omitempty"`
Base string `json:"templateBase"`
Icon string `json:"icon,omitempty"`
IconFilename string `json:"iconFilename,omitempty"`
Readme string `json:"readme,omitempty"`

View File

@ -65,6 +65,9 @@ func catalogTypes(schemas *types.Schemas) *types.Schemas {
"refresh": {},
}
}).
AddMapperForType(&Version, v3.Template{},
m.DisplayName{},
).
MustImport(&Version, v3.Template{}).
MustImport(&Version, v3.TemplateVersion{}).
MustImport(&Version, v3.TemplateContent{})

View File

@ -27,8 +27,7 @@ type AppSpec struct {
}
var (
AppConditionInstalled condition.Cond = "installed"
AppConditionUpdated condition.Cond = "updated"
AppConditionInstalled condition.Cond = "Installed"
)
type AppStatus struct {

View File

@ -47,6 +47,7 @@ var transitioningMap = map[string]string{
"Pending": "pending",
"PodScheduled": "scheduling",
"Provisioned": "provisioning",
"Refreshed": "refreshed",
"Registered": "registering",
"Removed": "removing",
"Saved": "saving",