rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-09-09 00:48:56 +00:00
Code Issues Releases Wiki Activity

Make multiclusterapp's Roles field required

Browse Source
This commit is contained in:
rajashree
2019-03-03 12:22:07 -08:00
committed by Alena Prokharchyk
parent 20f23a4e46
commit 049122e019
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
apis/management.cattle.io/v3/multi_cluster_app.go
View File

@@ -26,14 +26,13 @@ type MultiClusterApp struct {
}
type MultiClusterAppSpec struct {
TemplateVersionName string `json:"templateVersionName,omitempty" norman:"type=reference[templateVersion],required"`
Answers []Answer `json:"answers,omitempty"`
Targets []Target `json:"targets,omitempty" norman:"required,noupdate"`
Members []Member `json:"members,omitempty"`
Roles []string `json:"roles,omitempty" norman:"type=array[reference[roleTemplate]]"`
RevisionHistoryLimit int `json:"revisionHistoryLimit,omitempty" norman:"default=10"`
UpgradeStrategy UpgradeStrategy `json:"upgradeStrategy,omitempty"`
TargetToRole map[string][]string `json:"targetToRole,omitempty"`
TemplateVersionName string `json:"templateVersionName,omitempty" norman:"type=reference[templateVersion],required"`
Answers []Answer `json:"answers,omitempty"`
Targets []Target `json:"targets,omitempty" norman:"required,noupdate"`
Members []Member `json:"members,omitempty"`
Roles []string `json:"roles,omitempty" norman:"type=array[reference[roleTemplate]],required"`
RevisionHistoryLimit int `json:"revisionHistoryLimit,omitempty" norman:"default=10"`
UpgradeStrategy UpgradeStrategy `json:"upgradeStrategy,omitempty"`
}
type MultiClusterAppStatus struct {

2
apis/management.cattle.io/v3/schema/schema.go
View File

@@ -688,7 +688,7 @@ func clusterCatalogTypes(schemas *types.Schemas) *types.Schemas {
func multiClusterAppTypes(schemas *types.Schemas) *types.Schemas {
return schemas.
AddMapperForType(&Version, v3.MultiClusterApp{}, m.Drop{Field: "namespaceId"}, m.Drop{Field: "targetToRole"}).
AddMapperForType(&Version, v3.MultiClusterApp{}, m.Drop{Field: "namespaceId"}).
AddMapperForType(&Version, v3.MultiClusterAppRevision{}, m.Drop{Field: "namespaceId"}).
AddMapperForType(&Version, v3.Member{}, m.Drop{Field: "userName"}, m.Drop{Field: "displayName"}).
MustImport(&Version, v3.MultiClusterApp{}).