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

fix ineffassign and varcheck

Browse Source 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
This commit is contained in:
Davanum Srinivas 2021-07-12 19:14:30 -04:00
parent 26cc8e40a8
commit 07332ad398
No known key found for this signature in database
GPG Key ID: 80D83A796103BF59
9 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kube-proxy/app/server.go
View File

@ -90,7 +90,7 @@ const (
proxyModeUserspace = "userspace"
proxyModeIPTables = "iptables"
proxyModeIPVS = "ipvs"
proxyModeKernelspace = "kernelspace" //nolint:deadcode
proxyModeKernelspace = "kernelspace" //nolint:deadcode,varcheck
)
// proxyRun defines the interface to run a specified ProxyServer

4
pkg/apis/storage/validation/validation_test.go
View File

@ -1696,7 +1696,7 @@ func TestCSIDriverValidation(t *testing.T) {
storageCapacity := true
notStorageCapacity := false
supportedFSGroupPolicy := storage.FileFSGroupPolicy
invalidFSGroupPolicy := storage.ReadWriteOnceWithFSTypeFSGroupPolicy
invalidFSGroupPolicy := storage.ReadWriteOnceWithFSTypeFSGroupPolicy //nolint:ineffassign
invalidFSGroupPolicy = "invalid-mode"
successCases := []storage.CSIDriver{
{
@ -2051,7 +2051,7 @@ func TestCSIDriverValidationUpdate(t *testing.T) {
{
name: "FSGroupPolicy invalidated",
modify: func(new *storage.CSIDriver) {
invalidFSGroupPolicy := storage.ReadWriteOnceWithFSTypeFSGroupPolicy
invalidFSGroupPolicy := storage.ReadWriteOnceWithFSTypeFSGroupPolicy //nolint:ineffassign
invalidFSGroupPolicy = "invalid"
new.Spec.FSGroupPolicy = &invalidFSGroupPolicy
},

2
pkg/generated/openapi/cmd/models-schema/main.go
View File

@ -59,7 +59,7 @@ func output() error {
if err != nil {
return fmt.Errorf("error serializing api definitions: %w", err)
}
_, err = os.Stdout.Write(data)
_, _ = os.Stdout.Write(data)
return nil
}

5
test/e2e/common/node/pods.go
View File

@ -244,11 +244,6 @@ var _ = SIGDescribe("Pods", func() {
pods, err := podClient.List(context.TODO(), options)
framework.ExpectNoError(err, "failed to query for pods")
framework.ExpectEqual(len(pods.Items), 0)
options = metav1.ListOptions{
LabelSelector: selector.String(),
ResourceVersion: pods.ListMeta.ResourceVersion,
}
listCompleted := make(chan bool, 1)
lw := &cache.ListWatch{
ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {

1
test/e2e/lifecycle/bootstrap/bootstrap_signer.go
View File

@ -78,6 +78,7 @@ var _ = lifecycle.SIGDescribe("[Feature:BootstrapTokens]", func() {
ginkgo.By("wait for the bootstrap token secret be signed")
err = WaitforSignedClusterInfoByBootStrapToken(c, tokenID)
framework.ExpectNoError(err)
cfgMap, err := f.ClientSet.CoreV1().ConfigMaps(metav1.NamespacePublic).Get(context.TODO(), bootstrapapi.ConfigMapClusterInfo, metav1.GetOptions{})
framework.ExpectNoError(err)

1
test/e2e/node/events.go
View File

@ -83,6 +83,7 @@ var _ = SIGDescribe("Events", func() {
selector := labels.SelectorFromSet(labels.Set(map[string]string{"time": value}))
options := metav1.ListOptions{LabelSelector: selector.String()}
pods, err := podClient.List(context.TODO(), options)
framework.ExpectNoError(err)
framework.ExpectEqual(len(pods.Items), 1)
ginkgo.By("retrieving the pod")

4
test/e2e/node/pods.go
View File

@ -78,10 +78,6 @@ var _ = SIGDescribe("Pods Extended", func() {
pods, err := podClient.List(context.TODO(), options)
framework.ExpectNoError(err, "failed to query for pod")
framework.ExpectEqual(len(pods.Items), 0)
options = metav1.ListOptions{
LabelSelector: selector.String(),
ResourceVersion: pods.ListMeta.ResourceVersion,
}
ginkgo.By("submitting the pod to kubernetes")
podClient.Create(pod)

5
test/e2e/scheduling/limit_range.go
View File

@ -72,11 +72,6 @@ var _ = SIGDescribe("LimitRange", func() {
limitRanges, err := f.ClientSet.CoreV1().LimitRanges(f.Namespace.Name).List(context.TODO(), options)
framework.ExpectNoError(err, "failed to query for limitRanges")
framework.ExpectEqual(len(limitRanges.Items), 0)
options = metav1.ListOptions{
LabelSelector: selector.String(),
ResourceVersion: limitRanges.ListMeta.ResourceVersion,
}
listCompleted := make(chan bool, 1)
lw := &cache.ListWatch{
ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {

4
test/integration/evictions/evictions_test.go
View File

@ -61,7 +61,7 @@ const (
func TestConcurrentEvictionRequests(t *testing.T) {
podNameFormat := "test-pod-%d"
s, closeFn, rm, informers, clientSet := rmSetup(t)
s, closeFn, rm, informers, _ := rmSetup(t)
defer closeFn()
ns := framework.CreateTestingNamespace("concurrent-eviction-requests", s, t)
@ -180,7 +180,7 @@ func TestConcurrentEvictionRequests(t *testing.T) {
// TestTerminalPodEviction ensures that PDB is not checked for terminal pods.
func TestTerminalPodEviction(t *testing.T) {
s, closeFn, rm, informers, clientSet := rmSetup(t)
s, closeFn, rm, informers, _ := rmSetup(t)
defer closeFn()
ns := framework.CreateTestingNamespace("terminalpod-eviction", s, t)