Merge pull request #57536 from linyouchong/linyouchong-20171222

Automatic merge from submit-queue (batch tested with PRs 57536, 63812). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. fix spelling error in comment

Merge pull request #57536 from linyouchong/linyouchong-20171222
0ae403d7 · Kubernetes Submit Queue · GitHub · ab180d80 · c2661854 · 0ae403d7
Unverified Commit 0ae403d7 authored May 14, 2018 by Kubernetes Submit Queue Committed by GitHub May 14, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

util_test.go pkg/api/pod/util_test.go +1 -1

pvc_protection_controller.go ...troller/volume/pvcprotection/pvc_protection_controller.go +1 -1

No files found.
--- a/pkg/api/pod/util_test.go
+++ b/pkg/api/pod/util_test.go
@@ -314,7 +314,7 @@ func TestDropAlphaVolumeDevices(t *testing.T) {
 			t.Error("VolumeDevices in Container should not have been dropped based on feature-gate")
 		}
 		if testPod.Spec.InitContainers[0].VolumeDevices == nil {
-			t.Error("VolumeDevices in Container should not have been dropped based on feature-gate")
+			t.Error("VolumeDevices in InitContainers should not have been dropped based on feature-gate")
 		}
 	}

--- a/pkg/controller/volume/pvcprotection/pvc_protection_controller.go
+++ b/pkg/controller/volume/pvcprotection/pvc_protection_controller.go
@@ -54,7 +54,7 @@ type Controller struct {
 	storageObjectInUseProtectionEnabled bool
 }
-// NewPVCProtectionController returns a new *{VCProtectionController.
+// NewPVCProtectionController returns a new instance of PVCProtectionController.
 func NewPVCProtectionController(pvcInformer coreinformers.PersistentVolumeClaimInformer, podInformer coreinformers.PodInformer, cl clientset.Interface, storageObjectInUseProtectionFeatureEnabled bool) *Controller {
 	e := &Controller{
 		client: cl,