1
0
mirror of https://github.com/rancher/types.git synced 2025-08-31 12:48:45 +00:00

Add helm version to catalog,templates,apps

This commit is contained in:
Brenda Rearden
2020-02-27 09:46:15 -07:00
parent 068a357fa0
commit bd3290eba6
10 changed files with 23 additions and 8 deletions

View File

@@ -27,6 +27,7 @@ type CatalogSpec struct {
CatalogKind string `json:"catalogKind,omitempty"`
Username string `json:"username,omitempty"`
Password string `json:"password,omitempty" norman:"type=password"`
HelmVersion string `json:"helmVersion,omitempty" norman:"noupdate"`
}
type CatalogStatus struct {
@@ -114,6 +115,7 @@ type TemplateSpec struct {
}
type TemplateStatus struct {
HelmVersion string `json:"helmVersion,omitempty" norman:"noupdate,nocreate"`
}
type TemplateVersion struct {
@@ -165,6 +167,7 @@ type TemplateVersionSpec struct {
}
type TemplateVersionStatus struct {
HelmVersion string `json:"helmVersion,omitempty" norman:"noupdate,nocreate"`
}
type File struct {

View File

@@ -58,11 +58,11 @@ type AppStatus struct {
Notes string `json:"notes,omitempty"`
Conditions []AppCondition `json:"conditions,omitempty"`
LastAppliedTemplates string `json:"lastAppliedTemplate,omitempty"`
HelmVersion string `json:"helmVersion,omitempty" norman:"nocreate,noupdate"`
HelmVersion string `json:"helmVersion,omitempty" norman:"noupdate,nocreate"`
}
type AppCondition struct {
// Type of cluster condition.
// Type of cluster condition.q
Type condition.Cond `json:"type"`
// Status of the condition, one of True, False, Unknown.
Status v1.ConditionStatus `json:"status"`

View File

@@ -13,6 +13,7 @@ const (
CatalogFieldCreated = "created"
CatalogFieldCreatorID = "creatorId"
CatalogFieldDescription = "description"
CatalogFieldHelmVersion = "helmversion"
CatalogFieldKind = "kind"
CatalogFieldLabels = "labels"
CatalogFieldLastRefreshTimestamp = "lastRefreshTimestamp"
@@ -37,6 +38,7 @@ type Catalog struct {
Created string `json:"created,omitempty" yaml:"created,omitempty"`
CreatorID string `json:"creatorId,omitempty" yaml:"creatorId,omitempty"`
Description string `json:"description,omitempty" yaml:"description,omitempty"`
HelmVersion string `json:"helmversion,omitempty" yaml:"helmversion,omitempty"`
Kind string `json:"kind,omitempty" yaml:"kind,omitempty"`
Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"`
LastRefreshTimestamp string `json:"lastRefreshTimestamp,omitempty" yaml:"lastRefreshTimestamp,omitempty"`

View File

@@ -5,6 +5,7 @@ const (
CatalogSpecFieldBranch = "branch"
CatalogSpecFieldCatalogKind = "catalogKind"
CatalogSpecFieldDescription = "description"
CatalogSpecFieldHelmVersion = "helmversion"
CatalogSpecFieldPassword = "password"
CatalogSpecFieldURL = "url"
CatalogSpecFieldUsername = "username"
@@ -14,6 +15,7 @@ type CatalogSpec struct {
Branch string `json:"branch,omitempty" yaml:"branch,omitempty"`
CatalogKind string `json:"catalogKind,omitempty" yaml:"catalogKind,omitempty"`
Description string `json:"description,omitempty" yaml:"description,omitempty"`
HelmVersion string `json:"helmversion,omitempty" yaml:"helmversion,omitempty"`
Password string `json:"password,omitempty" yaml:"password,omitempty"`
URL string `json:"url,omitempty" yaml:"url,omitempty"`
Username string `json:"username,omitempty" yaml:"username,omitempty"`

View File

@@ -14,6 +14,7 @@ const (
ClusterCatalogFieldCreated = "created"
ClusterCatalogFieldCreatorID = "creatorId"
ClusterCatalogFieldDescription = "description"
ClusterCatalogFieldHelmVersion = "helmversion"
ClusterCatalogFieldKind = "kind"
ClusterCatalogFieldLabels = "labels"
ClusterCatalogFieldLastRefreshTimestamp = "lastRefreshTimestamp"
@@ -40,6 +41,7 @@ type ClusterCatalog struct {
Created string `json:"created,omitempty" yaml:"created,omitempty"`
CreatorID string `json:"creatorId,omitempty" yaml:"creatorId,omitempty"`
Description string `json:"description,omitempty" yaml:"description,omitempty"`
HelmVersion string `json:"helmversion,omitempty" yaml:"helmversion,omitempty"`
Kind string `json:"kind,omitempty" yaml:"kind,omitempty"`
Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"`
LastRefreshTimestamp string `json:"lastRefreshTimestamp,omitempty" yaml:"lastRefreshTimestamp,omitempty"`

View File

@@ -13,6 +13,7 @@ const (
ProjectCatalogFieldCreated = "created"
ProjectCatalogFieldCreatorID = "creatorId"
ProjectCatalogFieldDescription = "description"
ProjectCatalogFieldHelmVersion = "helmversion"
ProjectCatalogFieldKind = "kind"
ProjectCatalogFieldLabels = "labels"
ProjectCatalogFieldLastRefreshTimestamp = "lastRefreshTimestamp"
@@ -39,6 +40,7 @@ type ProjectCatalog struct {
Created string `json:"created,omitempty" yaml:"created,omitempty"`
CreatorID string `json:"creatorId,omitempty" yaml:"creatorId,omitempty"`
Description string `json:"description,omitempty" yaml:"description,omitempty"`
HelmVersion string `json:"helmversion,omitempty" yaml:"helmversion,omitempty"`
Kind string `json:"kind,omitempty" yaml:"kind,omitempty"`
Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"`
LastRefreshTimestamp string `json:"lastRefreshTimestamp,omitempty" yaml:"lastRefreshTimestamp,omitempty"`

View File

@@ -1,8 +1,10 @@
package client
const (
TemplateStatusType = "templateStatus"
TemplateStatusType = "templateStatus"
TemplateStatusFieldHelmVersion = "helmversion"
)
type TemplateStatus struct {
HelmVersion string `json:"helmversion,omitempty" yaml:"helmversion,omitempty"`
}

View File

@@ -1,8 +1,10 @@
package client
const (
TemplateVersionStatusType = "templateVersionStatus"
TemplateVersionStatusType = "templateVersionStatus"
TemplateVersionStatusFieldHelmVersion = "helmversion"
)
type TemplateVersionStatus struct {
HelmVersion string `json:"helmversion,omitempty" yaml:"helmversion,omitempty"`
}

View File

@@ -16,7 +16,7 @@ const (
AppFieldDescription = "description"
AppFieldExternalID = "externalId"
AppFieldFiles = "files"
AppFieldHelmVersion = "helmVersion"
AppFieldHelmVersion = "helmversion"
AppFieldLabels = "labels"
AppFieldLastAppliedTemplates = "lastAppliedTemplate"
AppFieldMultiClusterAppID = "multiClusterAppId"
@@ -49,7 +49,7 @@ type App struct {
Description string `json:"description,omitempty" yaml:"description,omitempty"`
ExternalID string `json:"externalId,omitempty" yaml:"externalId,omitempty"`
Files map[string]string `json:"files,omitempty" yaml:"files,omitempty"`
HelmVersion string `json:"helmVersion,omitempty" yaml:"helmVersion,omitempty"`
HelmVersion string `json:"helmversion,omitempty" yaml:"helmversion,omitempty"`
Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"`
LastAppliedTemplates string `json:"lastAppliedTemplate,omitempty" yaml:"lastAppliedTemplate,omitempty"`
MultiClusterAppID string `json:"multiClusterAppId,omitempty" yaml:"multiClusterAppId,omitempty"`

View File

@@ -4,7 +4,7 @@ const (
AppStatusType = "appStatus"
AppStatusFieldAppliedFiles = "appliedFiles"
AppStatusFieldConditions = "conditions"
AppStatusFieldHelmVersion = "helmVersion"
AppStatusFieldHelmVersion = "helmversion"
AppStatusFieldLastAppliedTemplates = "lastAppliedTemplate"
AppStatusFieldNotes = "notes"
)
@@ -12,7 +12,7 @@ const (
type AppStatus struct {
AppliedFiles map[string]string `json:"appliedFiles,omitempty" yaml:"appliedFiles,omitempty"`
Conditions []AppCondition `json:"conditions,omitempty" yaml:"conditions,omitempty"`
HelmVersion string `json:"helmVersion,omitempty" yaml:"helmVersion,omitempty"`
HelmVersion string `json:"helmversion,omitempty" yaml:"helmversion,omitempty"`
LastAppliedTemplates string `json:"lastAppliedTemplate,omitempty" yaml:"lastAppliedTemplate,omitempty"`
Notes string `json:"notes,omitempty" yaml:"notes,omitempty"`
}