diff --git a/apis/management.cattle.io/v3/globaldns_types.go b/apis/management.cattle.io/v3/globaldns_types.go index 5832d593..b1f2770d 100644 --- a/apis/management.cattle.io/v3/globaldns_types.go +++ b/apis/management.cattle.io/v3/globaldns_types.go @@ -22,6 +22,7 @@ type GlobalDNSSpec struct { ProjectNames []string `json:"projectNames" norman:"type=array[reference[project]]"` MultiClusterAppName string `json:"multiClusterAppName,omitempty" norman:"type=reference[multiClusterApp]"` ProviderName string `json:"providerName,omitempty" norman:"type=reference[globalDnsProvider]"` + Members []Member `json:"members,omitempty"` } type GlobalDNSStatus struct { diff --git a/apis/management.cattle.io/v3/multi_cluster_app.go b/apis/management.cattle.io/v3/multi_cluster_app.go index 52fc12e5..60462668 100644 --- a/apis/management.cattle.io/v3/multi_cluster_app.go +++ b/apis/management.cattle.io/v3/multi_cluster_app.go @@ -22,6 +22,7 @@ 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"` + Members []Member `json:"members,omitempty"` } type MultiClusterAppStatus struct { @@ -39,3 +40,11 @@ type Answer struct { ClusterName string `json:"clusterName,omitempty" norman:"type=reference[cluster]"` Values map[string]string `json:"values,omitempty" norman:"required"` } + +type Member struct { + UserName string `json:"userName,omitempty" norman:"type=reference[user]"` + UserPrincipalName string `json:"userPrincipalName,omitempty" norman:"type=reference[principal]"` + DisplayName string `json:"displayName,omitempty"` + GroupPrincipalName string `json:"groupPrincipalName,omitempty" norman:"type=reference[principal]"` + AccessType string `json:"accessType,omitempty" norman:"type=enum,options=all|readonly|update"` +} diff --git a/apis/management.cattle.io/v3/schema/schema.go b/apis/management.cattle.io/v3/schema/schema.go index f9daeab0..6e7ea082 100644 --- a/apis/management.cattle.io/v3/schema/schema.go +++ b/apis/management.cattle.io/v3/schema/schema.go @@ -620,6 +620,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"}). + AddMapperForType(&Version, v3.Member{}, m.Drop{Field: "userName"}, m.Drop{Field: "displayName"}). MustImport(&Version, v3.MultiClusterApp{}). MustImport(&Version, v3.Target{}) }