kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #85293 from huffmanca/include_fstype_csi 

Included FSType in CSI volumes

Kubernetes-commit: 2b6857db4d4226cc07180308fe8a8507abbc7700
This commit is contained in:
Kubernetes Publisher 2019-12-03 14:30:58 -08:00
parent 03dd8a5df9 fc490f462d
commit a3a0d014e5
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Godeps/Godeps.json generated
View File

@ -596,7 +596,7 @@
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "03184f823e28"
"Rev": "adc6f4cd9e7d"
},
{
"ImportPath": "k8s.io/cli-runtime",
@ -604,7 +604,7 @@
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "e9644b2e3edc"
"Rev": "bc9b51d240b2"
},
{
"ImportPath": "k8s.io/code-generator",
@ -612,7 +612,7 @@
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "0d4d24e738e4"
"Rev": "3ac1376c73aa"
},
{
"ImportPath": "k8s.io/gengo",

12
go.mod
View File

@ -37,10 +37,10 @@ require (
gopkg.in/yaml.v2 v2.2.4
gotest.tools v2.2.0+incompatible // indirect
k8s.io/api v0.0.0-20191121015604-11707872ac1c
k8s.io/apimachinery v0.0.0-20191128180518-03184f823e28
k8s.io/apimachinery v0.0.0-20191203211716-adc6f4cd9e7d
k8s.io/cli-runtime v0.0.0-20191204091246-2f9002c43394
k8s.io/client-go v0.0.0-20191204082519-e9644b2e3edc
k8s.io/component-base v0.0.0-20191204083903-0d4d24e738e4
k8s.io/client-go v0.0.0-20191204082520-bc9b51d240b2
k8s.io/component-base v0.0.0-20191204083906-3ac1376c73aa
k8s.io/klog v1.0.0
k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a
k8s.io/metrics v0.0.0-20191121021546-b1134fd1210c
@ -54,10 +54,10 @@ replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13
k8s.io/api => k8s.io/api v0.0.0-20191121015604-11707872ac1c
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191128180518-03184f823e28
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191203211716-adc6f4cd9e7d
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20191204091246-2f9002c43394
k8s.io/client-go => k8s.io/client-go v0.0.0-20191204082519-e9644b2e3edc
k8s.io/client-go => k8s.io/client-go v0.0.0-20191204082520-bc9b51d240b2
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20191121015212-c4c8f8345c7e
k8s.io/component-base => k8s.io/component-base v0.0.0-20191204083903-0d4d24e738e4
k8s.io/component-base => k8s.io/component-base v0.0.0-20191204083906-3ac1376c73aa
k8s.io/metrics => k8s.io/metrics v0.0.0-20191121021546-b1134fd1210c
)

6
go.sum
View File

@ -324,11 +324,11 @@ gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/api v0.0.0-20191121015604-11707872ac1c/go.mod h1:R/s4gKT0V/cWEnbQa9taNRJNbWUK57/Dx6cPj6MD3A0=
k8s.io/apimachinery v0.0.0-20191128180518-03184f823e28/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg=
k8s.io/apimachinery v0.0.0-20191203211716-adc6f4cd9e7d/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg=
k8s.io/cli-runtime v0.0.0-20191204091246-2f9002c43394/go.mod h1:/Blo2zCEC7hipSlcsvbJtx6nRoStWgS9Wd0d4v8Y094=
k8s.io/client-go v0.0.0-20191204082519-e9644b2e3edc/go.mod h1:5lSG1yeDZVwDYAHe9VK48SCe5zmcnkAcf2Mx59TuhmM=
k8s.io/client-go v0.0.0-20191204082520-bc9b51d240b2/go.mod h1:5lSG1yeDZVwDYAHe9VK48SCe5zmcnkAcf2Mx59TuhmM=
k8s.io/code-generator v0.0.0-20191121015212-c4c8f8345c7e/go.mod h1:DVmfPQgxQENqDIzVR2ddLXMH34qeszkKSdH/N+s+38s=
k8s.io/component-base v0.0.0-20191204083903-0d4d24e738e4/go.mod h1:8VIh1jErItC4bg9hLBkPneyS77Tin8KwSzbYepHJnQI=
k8s.io/component-base v0.0.0-20191204083906-3ac1376c73aa/go.mod h1:mECWvHCPhJudDVDMtBl+AIf/YnTMp5r1F947OYFUwP0=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=

3
pkg/describe/versioned/describe.go
View File

@ -1269,9 +1269,10 @@ func printCSIVolumeSource(csi *corev1.CSIVolumeSource, w PrefixWriter) {
func printCSIPersistentVolumeSource(csi *corev1.CSIPersistentVolumeSource, w PrefixWriter) {
w.Write(LEVEL_2, "Type:\tCSI (a Container Storage Interface (CSI) volume source)\n"+
" Driver:\t%v\n"+
" FSType:\t%v\n"+
" VolumeHandle:\t%v\n"+
" ReadOnly:\t%v\n",
csi.Driver, csi.VolumeHandle, csi.ReadOnly)
csi.Driver, csi.FSType, csi.VolumeHandle, csi.ReadOnly)
printCSIPersistentVolumeAttributesMultiline(w, "VolumeAttributes", csi.VolumeAttributes)
}