Merge pull request #103650 from dims/get-golangci-lint-back-on-its-feet

Get golangci lint back on its feet
This commit is contained in:
Kubernetes Prow Robot
2021-07-15 02:06:48 -07:00
committed by GitHub
19 changed files with 355 additions and 181 deletions

View File

@@ -245,10 +245,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{

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)

View File

@@ -47,8 +47,7 @@ import (
)
const (
negUpdateTimeout = 2 * time.Minute
instanceGroupAnnotation = "ingress.gcp.kubernetes.io/instance-groups"
negUpdateTimeout = 2 * time.Minute
)
var _ = common.SIGDescribe("Loadbalancing: L7", func() {

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")

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)

View File

@@ -72,10 +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{

View File

@@ -157,7 +157,6 @@ const (
gib int64 = mib * 1024
gib100 int64 = gib * 100
tib int64 = gib * 1024
tib100 int64 = tib * 100
)
func (s *service) newVolume(name string, capcity int64) csi.Volume {

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)