diff --git a/apis/management.cattle.io/v3/authn_types.go b/apis/management.cattle.io/v3/authn_types.go index b0389376..c3a3e8ef 100644 --- a/apis/management.cattle.io/v3/authn_types.go +++ b/apis/management.cattle.io/v3/authn_types.go @@ -25,7 +25,7 @@ type User struct { DisplayName string `json:"displayName,omitempty"` UserName string `json:"userName,omitempty"` - Password string `json:"password,omitempty"` + Password string `json:"password,omitempty" norman:"writeOnly,noupdate"` MustChangePassword bool `json:"mustChangePassword,omitempty"` PrincipalIDs []string `json:"principalIds,omitempty" norman:"type=array[reference[Principal]]"` } diff --git a/apis/project.cattle.io/v3/schema/schema.go b/apis/project.cattle.io/v3/schema/schema.go index 8813cc8f..4a7ce61b 100644 --- a/apis/project.cattle.io/v3/schema/schema.go +++ b/apis/project.cattle.io/v3/schema/schema.go @@ -46,14 +46,18 @@ func NamespaceTypes(version *types.APIVersion, schemas *types.Schemas) *types.Sc ). AddMapperForType(version, v1.Namespace{}, &m.LabelField{Field: "projectId"}, + &m.AnnotationField{Field: "externalId"}, + &m.AnnotationField{Field: "templates", Object: true}, + &m.AnnotationField{Field: "prune"}, + &m.AnnotationField{Field: "answers", Object: true}, ). MustImport(version, v1.Namespace{}, struct { - ProjectID string `norman:"type=reference[/v3/schemas/project]"` - Templates map[string]string - Answers map[string]interface{} - Prune bool - ExternalID string - Tags []string + ProjectID string `norman:"type=reference[/v3/schemas/project]"` + Templates map[string]string `json:"templates"` + Answers map[string]interface{} `json:"answers"` + Prune bool `json:"prune"` + ExternalID string `json:"externalId"` + Tags []string `json:"tags"` }{}) }