Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
7cab7bd4
Commit
7cab7bd4
authored
Feb 09, 2016
by
Tim Hockin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix a few go-vet errors
parent
ee54afc9
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
20 additions
and
21 deletions
+20
-21
persistentvolume_provisioner_controller.go
...rsistentvolume/persistentvolume_provisioner_controller.go
+3
-3
tcp_test.go
pkg/probe/tcp/tcp_test.go
+1
-1
iptables_test.go
pkg/util/iptables/iptables_test.go
+2
-2
port_range.go
pkg/util/net/port_range.go
+1
-1
errors.go
pkg/util/validation/field/errors.go
+1
-2
azure_file_test.go
pkg/volume/azure_file/azure_file_test.go
+1
-1
cephfs_test.go
pkg/volume/cephfs/cephfs_test.go
+2
-2
cinder_test.go
pkg/volume/cinder/cinder_test.go
+5
-5
fc_test.go
pkg/volume/fc/fc_test.go
+2
-2
e2e.go
test/e2e/e2e.go
+2
-2
No files found.
pkg/controller/persistentvolume/persistentvolume_provisioner_controller.go
View file @
7cab7bd4
...
@@ -202,7 +202,7 @@ func (controller *PersistentVolumeProvisionerController) reconcileClaim(claim *a
...
@@ -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
.
Error
f
(
"error updating persistent volume claim: %v"
,
err
)
}
}
return
nil
return
nil
...
@@ -246,7 +246,7 @@ func (controller *PersistentVolumeProvisionerController) reconcileVolume(pv *api
...
@@ -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
...
@@ -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
)
...
...
pkg/probe/tcp/tcp_test.go
View file @
7cab7bd4
...
@@ -79,7 +79,7 @@ func TestTcpHealthChecker(t *testing.T) {
...
@@ -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
)
}
}
}
}
}
}
pkg/util/iptables/iptables_test.go
View file @
7cab7bd4
...
@@ -673,7 +673,7 @@ func TestReload(t *testing.T) {
...
@@ -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) {
...
@@ -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
},
},
},
...
...
pkg/util/net/port_range.go
View file @
7cab7bd4
...
@@ -102,7 +102,7 @@ func ParsePortRange(value string) (*PortRange, error) {
...
@@ -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
}
}
pkg/util/validation/field/errors.go
View file @
7cab7bd4
...
@@ -120,8 +120,7 @@ func (t ErrorType) String() string {
...
@@ -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
""
}
}
}
}
...
...
pkg/volume/azure_file/azure_file_test.go
View file @
7cab7bd4
...
@@ -83,7 +83,7 @@ func contains(modes []api.PersistentVolumeAccessMode, mode api.PersistentVolumeA
...
@@ -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
{}
...
...
pkg/volume/cephfs/cephfs_test.go
View file @
7cab7bd4
...
@@ -81,7 +81,7 @@ func TestPlugin(t *testing.T) {
...
@@ -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) {
...
@@ -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
)
...
...
pkg/volume/cinder/cinder_test.go
View file @
7cab7bd4
...
@@ -158,7 +158,7 @@ func TestPlugin(t *testing.T) {
...
@@ -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) {
...
@@ -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) {
...
@@ -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) {
...
@@ -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) {
...
@@ -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
{
...
...
pkg/volume/fc/fc_test.go
View file @
7cab7bd4
...
@@ -144,7 +144,7 @@ func doTestPlugin(t *testing.T, spec *volume.Spec) {
...
@@ -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) {
...
@@ -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
{
...
...
test/e2e/e2e.go
View file @
7cab7bd4
...
@@ -119,7 +119,7 @@ func setupProviderConfig() error {
...
@@ -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 {
...
@@ -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
)
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment