From e6577033464b5c3008f4048a6368291bcc0f2800 Mon Sep 17 00:00:00 2001 From: linyouchong Date: Thu, 1 Feb 2018 15:55:02 +0800 Subject: [PATCH 1/2] fix spelling error in comment and log --- pkg/api/pod/util_test.go | 2 +- .../volume/pvcprotection/pvc_protection_controller.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/api/pod/util_test.go b/pkg/api/pod/util_test.go index 1c7eb328fca..43ddf8aff8a 100644 --- 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") } } diff --git a/pkg/controller/volume/pvcprotection/pvc_protection_controller.go b/pkg/controller/volume/pvcprotection/pvc_protection_controller.go index 8ce491ffcd3..378aae369f5 100644 --- a/pkg/controller/volume/pvcprotection/pvc_protection_controller.go +++ b/pkg/controller/volume/pvcprotection/pvc_protection_controller.go @@ -52,7 +52,7 @@ type Controller struct { queue workqueue.RateLimitingInterface } -// NewPVCProtectionController returns a new *{VCProtectionController. +// NewPVCProtectionController returns a new instance of PVCProtectionController. func NewPVCProtectionController(pvcInformer coreinformers.PersistentVolumeClaimInformer, podInformer coreinformers.PodInformer, cl clientset.Interface) *Controller { e := &Controller{ client: cl, From c2661854b52a1a0bc5d196074ec6b02a567a9804 Mon Sep 17 00:00:00 2001 From: linyouchong Date: Fri, 27 Apr 2018 14:17:11 +0800 Subject: [PATCH 2/2] Update pvc_protection_controller.go --- .../volume/pvcprotection/pvc_protection_controller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/controller/volume/pvcprotection/pvc_protection_controller.go b/pkg/controller/volume/pvcprotection/pvc_protection_controller.go index 18721dc55e9..5a8b6aa9f74 100644 --- a/pkg/controller/volume/pvcprotection/pvc_protection_controller.go +++ b/pkg/controller/volume/pvcprotection/pvc_protection_controller.go @@ -55,7 +55,7 @@ type Controller struct { } // NewPVCProtectionController returns a new instance of PVCProtectionController. -func NewPVCProtectionController(pvcInformer coreinformers.PersistentVolumeClaimInformer, podInformer coreinformers.PodInformer, cl clientset.Interface) *Controller { +func NewPVCProtectionController(pvcInformer coreinformers.PersistentVolumeClaimInformer, podInformer coreinformers.PodInformer, cl clientset.Interface, storageObjectInUseProtectionFeatureEnabled bool) *Controller { e := &Controller{ client: cl, queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "pvcprotection"),