Skip to content

Commit a074dd6

Browse files
committed
Use +default for now deprecated ScaleIO volume
1 parent 0f5ab4b commit a074dd6

File tree

19 files changed

+164
-41
lines changed

19 files changed

+164
-41
lines changed

api/openapi-spec/v3/api__v1_openapi.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6770,6 +6770,7 @@
67706770
"description": "ScaleIOPersistentVolumeSource represents a persistent ScaleIO volume",
67716771
"properties": {
67726772
"fsType": {
6773+
"default": "xfs",
67736774
"description": "fsType is the filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Default is \"xfs\"",
67746775
"type": "string"
67756776
},
@@ -6799,6 +6800,7 @@
67996800
"type": "boolean"
68006801
},
68016802
"storageMode": {
6803+
"default": "ThinProvisioned",
68026804
"description": "storageMode indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned. Default is ThinProvisioned.",
68036805
"type": "string"
68046806
},
@@ -6827,6 +6829,7 @@
68276829
"description": "ScaleIOVolumeSource represents a persistent ScaleIO volume",
68286830
"properties": {
68296831
"fsType": {
6832+
"default": "xfs",
68306833
"description": "fsType is the filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Default is \"xfs\".",
68316834
"type": "string"
68326835
},
@@ -6856,6 +6859,7 @@
68566859
"type": "boolean"
68576860
},
68586861
"storageMode": {
6862+
"default": "ThinProvisioned",
68596863
"description": "storageMode indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned. Default is ThinProvisioned.",
68606864
"type": "string"
68616865
},

api/openapi-spec/v3/apis__apps__v1_openapi.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4397,6 +4397,7 @@
43974397
"description": "ScaleIOVolumeSource represents a persistent ScaleIO volume",
43984398
"properties": {
43994399
"fsType": {
4400+
"default": "xfs",
44004401
"description": "fsType is the filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Default is \"xfs\".",
44014402
"type": "string"
44024403
},
@@ -4426,6 +4427,7 @@
44264427
"type": "boolean"
44274428
},
44284429
"storageMode": {
4430+
"default": "ThinProvisioned",
44294431
"description": "storageMode indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned. Default is ThinProvisioned.",
44304432
"type": "string"
44314433
},

api/openapi-spec/v3/apis__batch__v1_openapi.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3601,6 +3601,7 @@
36013601
"description": "ScaleIOVolumeSource represents a persistent ScaleIO volume",
36023602
"properties": {
36033603
"fsType": {
3604+
"default": "xfs",
36043605
"description": "fsType is the filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Default is \"xfs\".",
36053606
"type": "string"
36063607
},
@@ -3630,6 +3631,7 @@
36303631
"type": "boolean"
36313632
},
36323633
"storageMode": {
3634+
"default": "ThinProvisioned",
36333635
"description": "storageMode indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned. Default is ThinProvisioned.",
36343636
"type": "string"
36353637
},

api/openapi-spec/v3/apis__storage.k8s.io__v1_openapi.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,6 +1012,7 @@
10121012
"description": "ScaleIOPersistentVolumeSource represents a persistent ScaleIO volume",
10131013
"properties": {
10141014
"fsType": {
1015+
"default": "xfs",
10151016
"description": "fsType is the filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Default is \"xfs\"",
10161017
"type": "string"
10171018
},
@@ -1041,6 +1042,7 @@
10411042
"type": "boolean"
10421043
},
10431044
"storageMode": {
1045+
"default": "ThinProvisioned",
10441046
"description": "storageMode indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned. Default is ThinProvisioned.",
10451047
"type": "string"
10461048
},

pkg/apis/apps/v1/zz_generated.defaults.go

Lines changed: 24 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/apps/v1beta1/zz_generated.defaults.go

Lines changed: 12 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/apps/v1beta2/zz_generated.defaults.go

Lines changed: 24 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/batch/v1/zz_generated.defaults.go

Lines changed: 12 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/batch/v1beta1/zz_generated.defaults.go

Lines changed: 6 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/core/v1/defaults.go

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -414,24 +414,6 @@ func defaultHostNetworkPorts(containers *[]v1.Container) {
414414
}
415415
}
416416

417-
func SetDefaults_ScaleIOVolumeSource(obj *v1.ScaleIOVolumeSource) {
418-
if obj.StorageMode == "" {
419-
obj.StorageMode = "ThinProvisioned"
420-
}
421-
if obj.FSType == "" {
422-
obj.FSType = "xfs"
423-
}
424-
}
425-
426-
func SetDefaults_ScaleIOPersistentVolumeSource(obj *v1.ScaleIOPersistentVolumeSource) {
427-
if obj.StorageMode == "" {
428-
obj.StorageMode = "ThinProvisioned"
429-
}
430-
if obj.FSType == "" {
431-
obj.FSType = "xfs"
432-
}
433-
}
434-
435417
func SetDefaults_HostPathVolumeSource(obj *v1.HostPathVolumeSource) {
436418
typeVol := v1.HostPathUnset
437419
if obj.Type == nil {

0 commit comments

Comments
 (0)