github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

fix a few go-vet errors

Browse Source
This commit is contained in:
Tim Hockin 2016-02-09 13:20:31 -08:00
parent ee54afc9ed
commit 7cab7bd472
10 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/controller/persistentvolume/persistentvolume_provisioner_controller.go
View File

@ -202,7 +202,7 @@ func (controller *PersistentVolumeProvisionerController) reconcileClaim(claim *a
claim.Annotations[pvProvisioningRequiredAnnotationKey] = pvProvisioningCompletedAnnotationValue claim.Annotations[pvProvisioningRequiredAnnotationKey] = pvProvisioningCompletedAnnotationValue
_, err = controller.client.UpdatePersistentVolumeClaim(claim) _, err = controller.client.UpdatePersistentVolumeClaim(claim)
if err != nil { if err != nil {
glog.Error("error updating persistent volume claim: %v", err) glog.Errorf("error updating persistent volume claim: %v", err)
} }
return nil return nil
@ -246,7 +246,7 @@ func (controller *PersistentVolumeProvisionerController) reconcileVolume(pv *api
glog.V(5).Infof("PersistentVolume[%s] provisioning in progress", pv.Name) glog.V(5).Infof("PersistentVolume[%s] provisioning in progress", pv.Name)
err := provisionVolume(pv, controller) err := provisionVolume(pv, controller)
if err != nil { if err != nil {
return fmt.Errorf("Error provisioning PersistentVolume[%s]: %v", err) return fmt.Errorf("Error provisioning PersistentVolume[%s]: %v", pv.Name, err)
} }
return nil return nil
@ -283,7 +283,7 @@ func provisionVolume(pv *api.PersistentVolume, controller *PersistentVolumeProvi
if pv, apiErr := controller.client.UpdatePersistentVolumeStatus(pv); apiErr != nil { if pv, apiErr := controller.client.UpdatePersistentVolumeStatus(pv); apiErr != nil {
return fmt.Errorf("PersistentVolume[%s] failed provisioning and also failed status update: %v - %v", pv.Name, err, apiErr) return fmt.Errorf("PersistentVolume[%s] failed provisioning and also failed status update: %v - %v", pv.Name, err, apiErr)
} }
return fmt.Errorf("PersistentVolume[%s] failed provisioning : %v", pv.Name, err, err) return fmt.Errorf("PersistentVolume[%s] failed provisioning: %v", pv.Name, err)
} }
clone, err := conversion.NewCloner().DeepCopy(pv) clone, err := conversion.NewCloner().DeepCopy(pv)

2
pkg/probe/tcp/tcp_test.go
View File

@ -79,7 +79,7 @@ func TestTcpHealthChecker(t *testing.T) {
t.Errorf("#%d: expected error=%v, get=%v", i, tt.expectedError, err) t.Errorf("#%d: expected error=%v, get=%v", i, tt.expectedError, err)
} }
if !containsAny(output, tt.expectedOutputs) { if !containsAny(output, tt.expectedOutputs) {
t.Errorf("#%d: expected output=one of %#v, get=%s", tt.expectedOutputs, output) t.Errorf("#%d: expected output=one of %#v, get=%s", i, tt.expectedOutputs, output)
} }
} }
} }

4
pkg/util/iptables/iptables_test.go
View File

@ -673,7 +673,7 @@ func TestReload(t *testing.T) {
// EnsureChain // EnsureChain
func() ([]byte, error) { return []byte{}, nil }, func() ([]byte, error) { return []byte{}, nil },
// EnsureRule abc check // EnsureRule abc check
func() ([]byte, error) { return []byte{}, &exec.FakeExitError{1} }, func() ([]byte, error) { return []byte{}, &exec.FakeExitError{Status: 1} },
// EnsureRule abc // EnsureRule abc
func() ([]byte, error) { return []byte{}, nil }, func() ([]byte, error) { return []byte{}, nil },
@ -681,7 +681,7 @@ func TestReload(t *testing.T) {
// EnsureChain // EnsureChain
func() ([]byte, error) { return []byte{}, nil }, func() ([]byte, error) { return []byte{}, nil },
// EnsureRule abc check // EnsureRule abc check
func() ([]byte, error) { return []byte{}, &exec.FakeExitError{1} }, func() ([]byte, error) { return []byte{}, &exec.FakeExitError{Status: 1} },
// EnsureRule abc // EnsureRule abc
func() ([]byte, error) { return []byte{}, nil }, func() ([]byte, error) { return []byte{}, nil },
}, },

2
pkg/util/net/port_range.go
View File

@ -102,7 +102,7 @@ func ParsePortRange(value string) (*PortRange, error) {
func ParsePortRangeOrDie(value string) *PortRange { func ParsePortRangeOrDie(value string) *PortRange {
pr, err := ParsePortRange(value) pr, err := ParsePortRange(value)
if err != nil { if err != nil {
panic(fmt.Sprintf("couldn't parse port range: %v")) panic(fmt.Sprintf("couldn't parse port range %q: %v", value, err))
} }
return pr return pr
} }

3
pkg/util/validation/field/errors.go
View File

@ -120,8 +120,7 @@ func (t ErrorType) String() string {
case ErrorTypeInternal: case ErrorTypeInternal:
return "Internal error" return "Internal error"
default: default:
panic(fmt.Sprintf("unrecognized validation error: %q", t)) panic(fmt.Sprintf("unrecognized validation error: %q", string(t)))
return ""
} }
} }

2
pkg/volume/azure_file/azure_file_test.go
View File

@ -83,7 +83,7 @@ func contains(modes []api.PersistentVolumeAccessMode, mode api.PersistentVolumeA
func TestPlugin(t *testing.T) { func TestPlugin(t *testing.T) {
tmpDir, err := ioutil.TempDir(os.TempDir(), "azurefileTest") tmpDir, err := ioutil.TempDir(os.TempDir(), "azurefileTest")
if err != nil { if err != nil {
t.Fatalf("can't make a temp dir: %v") t.Fatalf("can't make a temp dir: %v", err)
} }
defer os.RemoveAll(tmpDir) defer os.RemoveAll(tmpDir)
plugMgr := volume.VolumePluginMgr{} plugMgr := volume.VolumePluginMgr{}

4
pkg/volume/cephfs/cephfs_test.go
View File

@ -81,7 +81,7 @@ func TestPlugin(t *testing.T) {
t.Errorf("Failed to make a new Builder: %v", err) t.Errorf("Failed to make a new Builder: %v", err)
} }
if builder == nil { if builder == nil {
t.Errorf("Got a nil Builder: %v") t.Errorf("Got a nil Builder")
} }
volpath := path.Join(tmpDir, "pods/poduid/volumes/kubernetes.io~cephfs/vol1") volpath := path.Join(tmpDir, "pods/poduid/volumes/kubernetes.io~cephfs/vol1")
path := builder.GetPath() path := builder.GetPath()
@ -103,7 +103,7 @@ func TestPlugin(t *testing.T) {
t.Errorf("Failed to make a new Cleaner: %v", err) t.Errorf("Failed to make a new Cleaner: %v", err)
} }
if cleaner == nil { if cleaner == nil {
t.Errorf("Got a nil Cleaner: %v") t.Errorf("Got a nil Cleaner")
} }
if err := cleaner.TearDown(); err != nil { if err := cleaner.TearDown(); err != nil {
t.Errorf("Expected success, got: %v", err) t.Errorf("Expected success, got: %v", err)

10
pkg/volume/cinder/cinder_test.go
View File

@ -158,7 +158,7 @@ func TestPlugin(t *testing.T) {
t.Errorf("Failed to make a new Builder: %v", err) t.Errorf("Failed to make a new Builder: %v", err)
} }
if builder == nil { if builder == nil {
t.Errorf("Got a nil Builder: %v") t.Errorf("Got a nil Builder")
} }
volPath := path.Join(tmpDir, "pods/poduid/volumes/kubernetes.io~cinder/vol1") volPath := path.Join(tmpDir, "pods/poduid/volumes/kubernetes.io~cinder/vol1")
path := builder.GetPath() path := builder.GetPath()
@ -189,7 +189,7 @@ func TestPlugin(t *testing.T) {
t.Errorf("Failed to make a new Cleaner: %v", err) t.Errorf("Failed to make a new Cleaner: %v", err)
} }
if cleaner == nil { if cleaner == nil {
t.Errorf("Got a nil Cleaner: %v") t.Errorf("Got a nil Cleaner")
} }
if err := cleaner.TearDown(); err != nil { if err := cleaner.TearDown(); err != nil {
@ -274,7 +274,7 @@ func TestAttachDetachRace(t *testing.T) {
t.Errorf("Failed to make a new Builder: %v", err) t.Errorf("Failed to make a new Builder: %v", err)
} }
if builder == nil { if builder == nil {
t.Errorf("Got a nil Builder: %v") t.Errorf("Got a nil Builder")
} }
if err := builder.SetUp(nil); err != nil { if err := builder.SetUp(nil); err != nil {
@ -288,7 +288,7 @@ func TestAttachDetachRace(t *testing.T) {
t.Errorf("Failed to make a new Builder: %v", err) t.Errorf("Failed to make a new Builder: %v", err)
} }
if builder == nil { if builder == nil {
t.Errorf("Got a nil Builder: %v") t.Errorf("Got a nil Builder")
} }
cleaner, err := plug.(*cinderPlugin).newCleanerInternal("vol1", types.UID("poduid"), &fakePDManager{time.Second}, fakeMounter) cleaner, err := plug.(*cinderPlugin).newCleanerInternal("vol1", types.UID("poduid"), &fakePDManager{time.Second}, fakeMounter)
@ -337,7 +337,7 @@ func TestAttachDetachRace(t *testing.T) {
t.Errorf("Failed to make a new Cleaner: %v", err) t.Errorf("Failed to make a new Cleaner: %v", err)
} }
if cleaner == nil { if cleaner == nil {
t.Errorf("Got a nil Cleaner: %v") t.Errorf("Got a nil Cleaner")
} }
if err := cleaner.TearDown(); err != nil { if err := cleaner.TearDown(); err != nil {

4
pkg/volume/fc/fc_test.go
View File

@ -144,7 +144,7 @@ func doTestPlugin(t *testing.T, spec *volume.Spec) {
t.Errorf("Failed to make a new Builder: %v", err) t.Errorf("Failed to make a new Builder: %v", err)
} }
if builder == nil { if builder == nil {
t.Errorf("Got a nil Builder: %v") t.Errorf("Got a nil Builder: %v", err)
} }
path := builder.GetPath() path := builder.GetPath()
@ -181,7 +181,7 @@ func doTestPlugin(t *testing.T, spec *volume.Spec) {
t.Errorf("Failed to make a new Cleaner: %v", err) t.Errorf("Failed to make a new Cleaner: %v", err)
} }
if cleaner == nil { if cleaner == nil {
t.Errorf("Got a nil Cleaner: %v") t.Errorf("Got a nil Cleaner: %v", err)
} }
if err := cleaner.TearDown(); err != nil { if err := cleaner.TearDown(); err != nil {

4
test/e2e/e2e.go
View File

@ -119,7 +119,7 @@ func setupProviderConfig() error {
managedZones := []string{zone} // Only single-zone for now managedZones := []string{zone} // Only single-zone for now
cloudConfig.Provider, err = gcecloud.CreateGCECloud(testContext.CloudConfig.ProjectID, region, zone, managedZones, "" /* networkUrl */, tokenSource, false /* useMetadataServer */) cloudConfig.Provider, err = gcecloud.CreateGCECloud(testContext.CloudConfig.ProjectID, region, zone, managedZones, "" /* networkUrl */, tokenSource, false /* useMetadataServer */)
if err != nil { if err != nil {
return fmt.Errorf("Error building GCE/GKE provider: ", err) return fmt.Errorf("Error building GCE/GKE provider: %v", err)
} }
case "aws": case "aws":
@ -137,7 +137,7 @@ func setupProviderConfig() error {
var err error var err error
cloudConfig.Provider, err = cloudprovider.GetCloudProvider(testContext.Provider, strings.NewReader(awsConfig)) cloudConfig.Provider, err = cloudprovider.GetCloudProvider(testContext.Provider, strings.NewReader(awsConfig))
if err != nil { if err != nil {
return fmt.Errorf("Error building AWS provider: ", err) return fmt.Errorf("Error building AWS provider: %v", err)
} }
} }