From 06b1eae63c32e61feecc03cd98e372016bf7833b Mon Sep 17 00:00:00 2001 From: WanLinghao Date: Mon, 25 Jun 2018 15:27:54 +0800 Subject: [PATCH] fix a return miss bug --- pkg/volume/projected/projected.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkg/volume/projected/projected.go b/pkg/volume/projected/projected.go index c17ba4c19f..d05ab232ee 100644 --- a/pkg/volume/projected/projected.go +++ b/pkg/volume/projected/projected.go @@ -362,13 +362,9 @@ func (c *projectedVolumeUnmounter) TearDownAt(dir string) error { } func getVolumeSource(spec *volume.Spec) (*v1.ProjectedVolumeSource, bool, error) { - var readOnly bool - var volumeSource *v1.ProjectedVolumeSource - if spec.Volume != nil && spec.Volume.Projected != nil { - volumeSource = spec.Volume.Projected - readOnly = spec.ReadOnly + return spec.Volume.Projected, spec.ReadOnly, nil } - return volumeSource, readOnly, fmt.Errorf("Spec does not reference a projected volume type") + return nil, false, fmt.Errorf("Spec does not reference a projected volume type") }