github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 18:00:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #57536 from linyouchong/linyouchong-20171222

Browse Source 
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
This commit is contained in:
Kubernetes Submit Queue 2018-05-14 19:44:07 -07:00 committed by GitHub
commit 0ae403d727
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/pod/util_test.go
View File

@ -314,7 +314,7 @@ func TestDropAlphaVolumeDevices(t *testing.T) {
t.Error("VolumeDevices in Container should not have been dropped based on feature-gate") t.Error("VolumeDevices in Container should not have been dropped based on feature-gate")
} }
if testPod.Spec.InitContainers[0].VolumeDevices == nil { 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")
} }
} }

2
pkg/controller/volume/pvcprotection/pvc_protection_controller.go
View File

@ -54,7 +54,7 @@ type Controller struct {
storageObjectInUseProtectionEnabled bool 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 { func NewPVCProtectionController(pvcInformer coreinformers.PersistentVolumeClaimInformer, podInformer coreinformers.PodInformer, cl clientset.Interface, storageObjectInUseProtectionFeatureEnabled bool) *Controller {
e := &Controller{ e := &Controller{
client: cl, client: cl,