Merge pull request #66035 from krunaljain/automated-cherry-pick-of-#65499-upstream-release-1.10
Automatic merge from submit-queue.
Automated cherry pick of #65499: Removes defaulting of CSI fsType to ext4
Cherry pick of #65499 on release-1.10.
#65499: Removes defaulting of CSI fsType to ext4
Kubernetes-commit: 0862ebdd7cf763f7000d48bbb59f32b3c292c150
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 4853135..846375b 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -64,87 +64,87 @@
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
- "Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+ "Rev": "e386b2658ed20923da8cc9250e552f082899a1ee"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
- "Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+ "Rev": "e386b2658ed20923da8cc9250e552f082899a1ee"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion",
- "Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+ "Rev": "e386b2658ed20923da8cc9250e552f082899a1ee"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
- "Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+ "Rev": "e386b2658ed20923da8cc9250e552f082899a1ee"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/fields",
- "Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+ "Rev": "e386b2658ed20923da8cc9250e552f082899a1ee"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/labels",
- "Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+ "Rev": "e386b2658ed20923da8cc9250e552f082899a1ee"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime",
- "Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+ "Rev": "e386b2658ed20923da8cc9250e552f082899a1ee"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
- "Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+ "Rev": "e386b2658ed20923da8cc9250e552f082899a1ee"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/selection",
- "Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+ "Rev": "e386b2658ed20923da8cc9250e552f082899a1ee"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/types",
- "Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+ "Rev": "e386b2658ed20923da8cc9250e552f082899a1ee"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
- "Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+ "Rev": "e386b2658ed20923da8cc9250e552f082899a1ee"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
- "Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+ "Rev": "e386b2658ed20923da8cc9250e552f082899a1ee"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/json",
- "Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+ "Rev": "e386b2658ed20923da8cc9250e552f082899a1ee"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/net",
- "Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+ "Rev": "e386b2658ed20923da8cc9250e552f082899a1ee"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
- "Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+ "Rev": "e386b2658ed20923da8cc9250e552f082899a1ee"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
- "Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+ "Rev": "e386b2658ed20923da8cc9250e552f082899a1ee"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
- "Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+ "Rev": "e386b2658ed20923da8cc9250e552f082899a1ee"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
- "Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+ "Rev": "e386b2658ed20923da8cc9250e552f082899a1ee"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
- "Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+ "Rev": "e386b2658ed20923da8cc9250e552f082899a1ee"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/watch",
- "Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+ "Rev": "e386b2658ed20923da8cc9250e552f082899a1ee"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
- "Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+ "Rev": "e386b2658ed20923da8cc9250e552f082899a1ee"
}
]
}
diff --git a/core/v1/generated.proto b/core/v1/generated.proto
index 845db97..757b2a6 100644
--- a/core/v1/generated.proto
+++ b/core/v1/generated.proto
@@ -188,7 +188,7 @@
// 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.
+ // Ex. "ext4", "xfs", "ntfs".
// +optional
optional string fsType = 4;
diff --git a/core/v1/types.go b/core/v1/types.go
index 8a69833..f1c5310 100644
--- a/core/v1/types.go
+++ b/core/v1/types.go
@@ -1746,7 +1746,7 @@
// 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.
+ // Ex. "ext4", "xfs", "ntfs".
// +optional
FSType string `json:"fsType,omitempty" protobuf:"bytes,4,opt,name=fsType"`
diff --git a/core/v1/types_swagger_doc_generated.go b/core/v1/types_swagger_doc_generated.go
index 7b41f01..367d9ad 100644
--- a/core/v1/types_swagger_doc_generated.go
+++ b/core/v1/types_swagger_doc_generated.go
@@ -121,7 +121,7 @@
"driver": "Driver is the name of the driver to use for this volume. Required.",
"volumeHandle": "VolumeHandle is the unique volume name returned by the CSI volume plugin’s CreateVolume to refer to the volume on all subsequent calls. Required.",
"readOnly": "Optional: The value to pass to ControllerPublishVolumeRequest. Defaults to false (read/write).",
- "fsType": "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.",
+ "fsType": "Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\".",
"volumeAttributes": "Attributes of the volume to publish.",
"controllerPublishSecretRef": "ControllerPublishSecretRef is a reference to the secret object containing sensitive information to pass to the CSI driver to complete the CSI ControllerPublishVolume and ControllerUnpublishVolume calls. This field is optional, and may be empty if no secret is required. If the secret object contains more than one secret, all secrets are passed.",
"nodeStageSecretRef": "NodeStageSecretRef is a reference to the secret object containing sensitive information to pass to the CSI driver to complete the CSI NodeStageVolume and NodeStageVolume and NodeUnstageVolume calls. This field is optional, and may be empty if no secret is required. If the secret object contains more than one secret, all secrets are passed.",
