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

Merge pull request #1159 from ryansann/resource-name-validation

Browse Source 
Relax Resource Name Validation - ConfigMaps, Secrets, PVs, PVCs
This commit is contained in:
Ryan Sanna 2020-06-25 10:41:56 -07:00 committed by GitHub
commit fe03f32597
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apis/cluster.cattle.io/v3/schema/schema.go
View File

@ -85,6 +85,12 @@ func persistentVolumeTypes(schemas *types.Schemas) *types.Schemas {
Description string `json:"description"`
}{}).
MustImportAndCustomize(&Version, v1.PersistentVolume{}, func(schema *types.Schema) {
schema.MustCustomizeField("name", func(field types.Field) types.Field {
field.Type = "hostname"
field.Nullable = false
field.Required = true
return field
})
schema.MustCustomizeField("volumeMode", func(field types.Field) types.Field {
field.Update = false
return field

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

@ -98,6 +98,12 @@ func mgmtSecretTypes(schemas *types.Schemas) *types.Schemas {
schema.PluralName = "managementSecrets"
schema.CodeName = "ManagementSecret"
schema.CodeNamePlural = "ManagementSecrets"
schema.MustCustomizeField("name", func(field types.Field) types.Field {
field.Type = "hostname"
field.Nullable = false
field.Required = true
return field
})
})
}

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"`
}{}).