Merge pull request kubernetes#80904 from fredkan/fix-flexvolume-volumename-issue

k8s-ci-robot · web-flow · commit 5df8781ee321 · 2019-08-19T07:35:32.000-07:00
Fix flexvolume volumename issue
diff --git a/pkg/volume/flexvolume/plugin-defaults.go b/pkg/volume/flexvolume/plugin-defaults.go
@@ -29,6 +29,6 @@ func logPrefix(plugin *flexVolumePlugin) string {
 }
 
 func (plugin *pluginDefaults) GetVolumeName(spec *volume.Spec) (string, error) {
-	klog.Warning(logPrefix((*flexVolumePlugin)(plugin)), "using default GetVolumeName for volume ", spec.Name())
+	klog.V(4).Infof(logPrefix((*flexVolumePlugin)(plugin)), "using default GetVolumeName for volume ", spec.Name())
 	return spec.Name(), nil
 }
diff --git a/pkg/volume/flexvolume/plugin.go b/pkg/volume/flexvolume/plugin.go
@@ -134,7 +134,7 @@ func (plugin *flexVolumePlugin) GetVolumeName(spec *volume.Spec) (string, error)
 		return "", err
 	}
 
-	klog.Warning(logPrefix(plugin), "GetVolumeName is not supported yet. Defaulting to PV or volume name: ", name)
+	klog.V(4).Infof(logPrefix(plugin), "GetVolumeName is not supported yet. Defaulting to PV or volume name: ", name)
 
 	return name, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,6 @@ func logPrefix(plugin *flexVolumePlugin) string {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`func (plugin pluginDefaults) GetVolumeName(spec volume.Spec) (string, error) {`
`32`		`- klog.Warning(logPrefix((*flexVolumePlugin)(plugin)), "using default GetVolumeName for volume ", spec.Name())`
	`32`	`+ klog.V(4).Infof(logPrefix((*flexVolumePlugin)(plugin)), "using default GetVolumeName for volume ", spec.Name())`
`33`	`33`	`return spec.Name(), nil`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ func (plugin flexVolumePlugin) GetVolumeName(spec volume.Spec) (string, error)`
`134`	`134`	`return "", err`
`135`	`135`	`}`
`136`	`136`
`137`		`- klog.Warning(logPrefix(plugin), "GetVolumeName is not supported yet. Defaulting to PV or volume name: ", name)`
	`137`	`+ klog.V(4).Infof(logPrefix(plugin), "GetVolumeName is not supported yet. Defaulting to PV or volume name: ", name)`
`138`	`138`
`139`	`139`	`return name, nil`
`140`	`140`	`}`