diff --git a/apis/management.cattle.io/v3/catalog_types.go b/apis/management.cattle.io/v3/catalog_types.go index f0295b4f..ef098346 100644 --- a/apis/management.cattle.io/v3/catalog_types.go +++ b/apis/management.cattle.io/v3/catalog_types.go @@ -25,6 +25,12 @@ type CatalogSpec struct { type CatalogStatus struct { LastRefreshTimestamp string `json:"lastRefreshTimestamp,omitempty"` Commit string `json:"commit,omitempty"` + // helmVersionCommits records hash of each helm template version + HelmVersionCommits map[string]VersionCommits `json:"helmVersionCommits,omitempty"` +} + +type VersionCommits struct { + Value map[string]string `json:"Value,omitempty"` } type Template struct { diff --git a/apis/management.cattle.io/v3/schema/schema.go b/apis/management.cattle.io/v3/schema/schema.go index 8fbb84c1..e04fa316 100644 --- a/apis/management.cattle.io/v3/schema/schema.go +++ b/apis/management.cattle.io/v3/schema/schema.go @@ -214,7 +214,7 @@ func authnTypes(schemas *types.Schemas) *types.Schemas { func stackTypes(schema *types.Schemas) *types.Schemas { return schema. - MustImportAndCustomize(&Version, v3.Stack{}, func(schema *types.Schema) { + MustImportAndCustomize(&Version, v3.App{}, func(schema *types.Schema) { schema.ResourceActions = map[string]types.Action{ "upgrade": { Input: "templateVersionId", diff --git a/apis/management.cattle.io/v3/stack_types.go b/apis/management.cattle.io/v3/stack_types.go index d42ee034..0d9ef8db 100644 --- a/apis/management.cattle.io/v3/stack_types.go +++ b/apis/management.cattle.io/v3/stack_types.go @@ -5,16 +5,16 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -type Stack struct { +type App struct { types.Namespaced metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` - Spec StackSpec `json:"spec,omitempty"` - Status StackStatus `json:"status,omitempty"` + Spec AppSpec `json:"spec,omitempty"` + Status AppStatus `json:"status,omitempty"` } -type StackSpec struct { +type AppSpec struct { ProjectName string `json:"projectName,omitempty" norman:"type=reference[project]"` Description string `json:"description,omitempty"` InstallNamespace string `json:"installNamespace,omitempty"` @@ -27,7 +27,7 @@ type StackSpec struct { Groups []string `json:"groups,omitempty"` } -type StackStatus struct { +type AppStatus struct { Releases []ReleaseInfo `json:"releases,omitempty"` }