Skip to content

Commit df20694

Browse files
authored
Merge pull request kubernetes#125600 from thockin/plus_default_deprecated_volumes
Use +default for deprecated volume types
2 parents 41f2182 + a074dd6 commit df20694

File tree

19 files changed

+1744
-1004
lines changed

19 files changed

+1744
-1004
lines changed

api/openapi-spec/v3/api__v1_openapi.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,7 @@
313313
"description": "AzureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.",
314314
"properties": {
315315
"cachingMode": {
316+
"default": "ReadWrite",
316317
"description": "cachingMode is the Host Caching mode: None, Read Only, Read Write.",
317318
"type": "string"
318319
},
@@ -327,14 +328,17 @@
327328
"type": "string"
328329
},
329330
"fsType": {
331+
"default": "ext4",
330332
"description": "fsType is Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Implicitly inferred to be \"ext4\" if unspecified.",
331333
"type": "string"
332334
},
333335
"kind": {
336+
"default": "Shared",
334337
"description": "kind expected values are Shared: multiple blob disks per storage account Dedicated: single blob disk per storage account Managed: azure managed data disk (only in managed availability set). defaults to shared",
335338
"type": "string"
336339
},
337340
"readOnly": {
341+
"default": false,
338342
"description": "readOnly Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.",
339343
"type": "boolean"
340344
}
@@ -2873,6 +2877,7 @@
28732877
"type": "string"
28742878
},
28752879
"iscsiInterface": {
2880+
"default": "default",
28762881
"description": "iscsiInterface is the interface Name that uses an iSCSI transport. Defaults to 'default' (tcp).",
28772882
"type": "string"
28782883
},
@@ -2941,6 +2946,7 @@
29412946
"type": "string"
29422947
},
29432948
"iscsiInterface": {
2949+
"default": "default",
29442950
"description": "iscsiInterface is the interface Name that uses an iSCSI transport. Defaults to 'default' (tcp).",
29452951
"type": "string"
29462952
},
@@ -6206,6 +6212,7 @@
62066212
"type": "string"
62076213
},
62086214
"keyring": {
6215+
"default": "/etc/ceph/keyring",
62096216
"description": "keyring is the path to key ring for RBDUser. Default is /etc/ceph/keyring. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it",
62106217
"type": "string"
62116218
},
@@ -6219,6 +6226,7 @@
62196226
"x-kubernetes-list-type": "atomic"
62206227
},
62216228
"pool": {
6229+
"default": "rbd",
62226230
"description": "pool is the rados pool name. Default is rbd. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it",
62236231
"type": "string"
62246232
},
@@ -6235,6 +6243,7 @@
62356243
"description": "secretRef is name of the authentication secret for RBDUser. If provided overrides keyring. Default is nil. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it"
62366244
},
62376245
"user": {
6246+
"default": "admin",
62386247
"description": "user is the rados user name. Default is admin. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it",
62396248
"type": "string"
62406249
}
@@ -6258,6 +6267,7 @@
62586267
"type": "string"
62596268
},
62606269
"keyring": {
6270+
"default": "/etc/ceph/keyring",
62616271
"description": "keyring is the path to key ring for RBDUser. Default is /etc/ceph/keyring. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it",
62626272
"type": "string"
62636273
},
@@ -6271,6 +6281,7 @@
62716281
"x-kubernetes-list-type": "atomic"
62726282
},
62736283
"pool": {
6284+
"default": "rbd",
62746285
"description": "pool is the rados pool name. Default is rbd. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it",
62756286
"type": "string"
62766287
},
@@ -6287,6 +6298,7 @@
62876298
"description": "secretRef is name of the authentication secret for RBDUser. If provided overrides keyring. Default is nil. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it"
62886299
},
62896300
"user": {
6301+
"default": "admin",
62906302
"description": "user is the rados user name. Default is admin. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it",
62916303
"type": "string"
62926304
}
@@ -6758,6 +6770,7 @@
67586770
"description": "ScaleIOPersistentVolumeSource represents a persistent ScaleIO volume",
67596771
"properties": {
67606772
"fsType": {
6773+
"default": "xfs",
67616774
"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\"",
67626775
"type": "string"
67636776
},
@@ -6787,6 +6800,7 @@
67876800
"type": "boolean"
67886801
},
67896802
"storageMode": {
6803+
"default": "ThinProvisioned",
67906804
"description": "storageMode indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned. Default is ThinProvisioned.",
67916805
"type": "string"
67926806
},
@@ -6815,6 +6829,7 @@
68156829
"description": "ScaleIOVolumeSource represents a persistent ScaleIO volume",
68166830
"properties": {
68176831
"fsType": {
6832+
"default": "xfs",
68186833
"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\".",
68196834
"type": "string"
68206835
},
@@ -6844,6 +6859,7 @@
68446859
"type": "boolean"
68456860
},
68466861
"storageMode": {
6862+
"default": "ThinProvisioned",
68476863
"description": "storageMode indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned. Default is ThinProvisioned.",
68486864
"type": "string"
68496865
},

api/openapi-spec/v3/apis__apps__v1_openapi.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1421,6 +1421,7 @@
14211421
"description": "AzureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.",
14221422
"properties": {
14231423
"cachingMode": {
1424+
"default": "ReadWrite",
14241425
"description": "cachingMode is the Host Caching mode: None, Read Only, Read Write.",
14251426
"type": "string"
14261427
},
@@ -1435,14 +1436,17 @@
14351436
"type": "string"
14361437
},
14371438
"fsType": {
1439+
"default": "ext4",
14381440
"description": "fsType is Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Implicitly inferred to be \"ext4\" if unspecified.",
14391441
"type": "string"
14401442
},
14411443
"kind": {
1444+
"default": "Shared",
14421445
"description": "kind expected values are Shared: multiple blob disks per storage account Dedicated: single blob disk per storage account Managed: azure managed data disk (only in managed availability set). defaults to shared",
14431446
"type": "string"
14441447
},
14451448
"readOnly": {
1449+
"default": false,
14461450
"description": "readOnly Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.",
14471451
"type": "boolean"
14481452
}
@@ -2772,6 +2776,7 @@
27722776
"type": "string"
27732777
},
27742778
"iscsiInterface": {
2779+
"default": "default",
27752780
"description": "iscsiInterface is the interface Name that uses an iSCSI transport. Defaults to 'default' (tcp).",
27762781
"type": "string"
27772782
},
@@ -4247,6 +4252,7 @@
42474252
"type": "string"
42484253
},
42494254
"keyring": {
4255+
"default": "/etc/ceph/keyring",
42504256
"description": "keyring is the path to key ring for RBDUser. Default is /etc/ceph/keyring. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it",
42514257
"type": "string"
42524258
},
@@ -4260,6 +4266,7 @@
42604266
"x-kubernetes-list-type": "atomic"
42614267
},
42624268
"pool": {
4269+
"default": "rbd",
42634270
"description": "pool is the rados pool name. Default is rbd. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it",
42644271
"type": "string"
42654272
},
@@ -4276,6 +4283,7 @@
42764283
"description": "secretRef is name of the authentication secret for RBDUser. If provided overrides keyring. Default is nil. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it"
42774284
},
42784285
"user": {
4286+
"default": "admin",
42794287
"description": "user is the rados user name. Default is admin. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it",
42804288
"type": "string"
42814289
}
@@ -4389,6 +4397,7 @@
43894397
"description": "ScaleIOVolumeSource represents a persistent ScaleIO volume",
43904398
"properties": {
43914399
"fsType": {
4400+
"default": "xfs",
43924401
"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\".",
43934402
"type": "string"
43944403
},
@@ -4418,6 +4427,7 @@
44184427
"type": "boolean"
44194428
},
44204429
"storageMode": {
4430+
"default": "ThinProvisioned",
44214431
"description": "storageMode indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned. Default is ThinProvisioned.",
44224432
"type": "string"
44234433
},

api/openapi-spec/v3/apis__batch__v1_openapi.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -770,6 +770,7 @@
770770
"description": "AzureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.",
771771
"properties": {
772772
"cachingMode": {
773+
"default": "ReadWrite",
773774
"description": "cachingMode is the Host Caching mode: None, Read Only, Read Write.",
774775
"type": "string"
775776
},
@@ -784,14 +785,17 @@
784785
"type": "string"
785786
},
786787
"fsType": {
788+
"default": "ext4",
787789
"description": "fsType is Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Implicitly inferred to be \"ext4\" if unspecified.",
788790
"type": "string"
789791
},
790792
"kind": {
793+
"default": "Shared",
791794
"description": "kind expected values are Shared: multiple blob disks per storage account Dedicated: single blob disk per storage account Managed: azure managed data disk (only in managed availability set). defaults to shared",
792795
"type": "string"
793796
},
794797
"readOnly": {
798+
"default": false,
795799
"description": "readOnly Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.",
796800
"type": "boolean"
797801
}
@@ -2121,6 +2125,7 @@
21212125
"type": "string"
21222126
},
21232127
"iscsiInterface": {
2128+
"default": "default",
21242129
"description": "iscsiInterface is the interface Name that uses an iSCSI transport. Defaults to 'default' (tcp).",
21252130
"type": "string"
21262131
},
@@ -3451,6 +3456,7 @@
34513456
"type": "string"
34523457
},
34533458
"keyring": {
3459+
"default": "/etc/ceph/keyring",
34543460
"description": "keyring is the path to key ring for RBDUser. Default is /etc/ceph/keyring. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it",
34553461
"type": "string"
34563462
},
@@ -3464,6 +3470,7 @@
34643470
"x-kubernetes-list-type": "atomic"
34653471
},
34663472
"pool": {
3473+
"default": "rbd",
34673474
"description": "pool is the rados pool name. Default is rbd. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it",
34683475
"type": "string"
34693476
},
@@ -3480,6 +3487,7 @@
34803487
"description": "secretRef is name of the authentication secret for RBDUser. If provided overrides keyring. Default is nil. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it"
34813488
},
34823489
"user": {
3490+
"default": "admin",
34833491
"description": "user is the rados user name. Default is admin. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it",
34843492
"type": "string"
34853493
}
@@ -3593,6 +3601,7 @@
35933601
"description": "ScaleIOVolumeSource represents a persistent ScaleIO volume",
35943602
"properties": {
35953603
"fsType": {
3604+
"default": "xfs",
35963605
"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\".",
35973606
"type": "string"
35983607
},
@@ -3622,6 +3631,7 @@
36223631
"type": "boolean"
36233632
},
36243633
"storageMode": {
3634+
"default": "ThinProvisioned",
36253635
"description": "storageMode indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned. Default is ThinProvisioned.",
36263636
"type": "string"
36273637
},

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
"description": "AzureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.",
3333
"properties": {
3434
"cachingMode": {
35+
"default": "ReadWrite",
3536
"description": "cachingMode is the Host Caching mode: None, Read Only, Read Write.",
3637
"type": "string"
3738
},
@@ -46,14 +47,17 @@
4647
"type": "string"
4748
},
4849
"fsType": {
50+
"default": "ext4",
4951
"description": "fsType is Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Implicitly inferred to be \"ext4\" if unspecified.",
5052
"type": "string"
5153
},
5254
"kind": {
55+
"default": "Shared",
5356
"description": "kind expected values are Shared: multiple blob disks per storage account Dedicated: single blob disk per storage account Managed: azure managed data disk (only in managed availability set). defaults to shared",
5457
"type": "string"
5558
},
5659
"readOnly": {
60+
"default": false,
5761
"description": "readOnly Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.",
5862
"type": "boolean"
5963
}
@@ -427,6 +431,7 @@
427431
"type": "string"
428432
},
429433
"iscsiInterface": {
434+
"default": "default",
430435
"description": "iscsiInterface is the interface Name that uses an iSCSI transport. Defaults to 'default' (tcp).",
431436
"type": "string"
432437
},
@@ -961,6 +966,7 @@
961966
"type": "string"
962967
},
963968
"keyring": {
969+
"default": "/etc/ceph/keyring",
964970
"description": "keyring is the path to key ring for RBDUser. Default is /etc/ceph/keyring. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it",
965971
"type": "string"
966972
},
@@ -974,6 +980,7 @@
974980
"x-kubernetes-list-type": "atomic"
975981
},
976982
"pool": {
983+
"default": "rbd",
977984
"description": "pool is the rados pool name. Default is rbd. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it",
978985
"type": "string"
979986
},
@@ -990,6 +997,7 @@
990997
"description": "secretRef is name of the authentication secret for RBDUser. If provided overrides keyring. Default is nil. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it"
991998
},
992999
"user": {
1000+
"default": "admin",
9931001
"description": "user is the rados user name. Default is admin. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it",
9941002
"type": "string"
9951003
}
@@ -1004,6 +1012,7 @@
10041012
"description": "ScaleIOPersistentVolumeSource represents a persistent ScaleIO volume",
10051013
"properties": {
10061014
"fsType": {
1015+
"default": "xfs",
10071016
"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\"",
10081017
"type": "string"
10091018
},
@@ -1033,6 +1042,7 @@
10331042
"type": "boolean"
10341043
},
10351044
"storageMode": {
1045+
"default": "ThinProvisioned",
10361046
"description": "storageMode indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned. Default is ThinProvisioned.",
10371047
"type": "string"
10381048
},

0 commit comments

Comments
 (0)