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

Fix some PV types

Browse Source
This commit is contained in:
Darren Shepherd
2018-03-19 14:58:12 -07:00
parent ed47e37c35
commit cebb13fdcc
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,6 +41,9 @@ func namespaceTypes(schemas *types.Schemas) *types.Schemas {
func persistentVolumeTypes(schemas *types.Schemas) *types.Schemas {
return schemas.
MustImport(&Version, v1.PersistentVolumeSpec{}, struct {
StorageClassName *string `json:"storageClassName,omitempty" norman:"type=reference[storageClass]"`
}{}).
MustImport(&Version, v1.PersistentVolume{})
}

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

@@ -625,6 +625,21 @@ func ingressTypes(schemas *types.Schemas) *types.Schemas {
func volumeTypes(schemas *types.Schemas) *types.Schemas {
return schemas.
AddMapperForType(&Version, v1.HostPathVolumeSource{},
m.Move{From: "type", To: "kind"},
m.Enum{
Options: []string{
"DirectoryOrCreate",
"Directory",
"FileOrCreate",
"File",
"Socket",
"CharDevice",
"BlockDevice",
},
Field: "kind",
},
).
AddMapperForType(&Version, v1.ResourceRequirements{},
mapper.PivotMapper{Plural: true},
).
@@ -639,6 +654,9 @@ func volumeTypes(schemas *types.Schemas) *types.Schemas {
}{}).
MustImport(&Version, v1.Volume{}, struct {
}{}).
MustImport(&Version, v1.PersistentVolumeSpec{}, struct {
StorageClassName *string `json:"storageClassName,omitempty" norman:"type=reference[/v3/cluster/storageClass]"`
}{}).
MustImport(&Version, v1.PersistentVolumeClaimSpec{}, struct {
AccessModes []string `json:"accessModes,omitempty" norman:"type=array[enum],options=ReadWriteOnce|ReadOnlyMany|ReadWriteMany"`
VolumeName string `json:"volumeName,omitempty" norman:"type=reference[/v3/cluster/persistentVolume]"`