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

relax name validation on several types

Browse Source
This commit is contained in:
Ryan Sanna
2020-06-05 10:21:27 -07:00
parent 12f6c09793
commit 02238b1693
4 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
apis/project.cattle.io/v3/schema/schema.go
View File

@@ -53,7 +53,14 @@ var (
)
func configMapTypes(schemas *types.Schemas) *types.Schemas {
return schemas.MustImport(&Version, v1.ConfigMap{}, projectOverride{})
return schemas.MustImportAndCustomize(&Version, v1.ConfigMap{}, func(schema *types.Schema) {
schema.MustCustomizeField("name", func(field types.Field) types.Field {
field.Type = "hostname"
field.Nullable = false
field.Required = true
return field
})
}, projectOverride{})
}
type DeploymentConfig struct {
@@ -775,7 +782,14 @@ func volumeTypes(schemas *types.Schemas) *types.Schemas {
VolumeName string `json:"volumeName,omitempty" norman:"type=reference[/v3/cluster/persistentVolume]"`
StorageClassName *string `json:"storageClassName,omitempty" norman:"type=reference[/v3/cluster/storageClass]"`
}{}).
MustImport(&Version, v1.PersistentVolumeClaim{}, projectOverride{})
MustImportAndCustomize(&Version, v1.PersistentVolumeClaim{}, func(schema *types.Schema) {
schema.MustCustomizeField("name", func(field types.Field) types.Field {
field.Type = "hostname"
field.Nullable = false
field.Required = true
return field
})
}, projectOverride{})
}
func appTypes(schema *types.Schemas) *types.Schemas {

6
apis/project.cattle.io/v3/schema/schema_secrets.go
View File

@@ -219,6 +219,12 @@ func secretTypes(schemas *types.Schemas) *types.Schemas {
}
return f
})
schema.MustCustomizeField("name", func(field types.Field) types.Field {
field.Type = "hostname"
field.Nullable = false
field.Required = true
return field
})
}, projectOverride{}, struct {
Description string `json:"description"`
}{}).