From bf640d4c4d76173c9a17e8f54d7dae2d793d1b2f Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Fri, 30 Aug 2024 16:32:09 +0300 Subject: [PATCH 1/2] scripts/test-infra: bump golangci-lint to v1.60.3 --- scripts/test-infra/verify.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/test-infra/verify.sh b/scripts/test-infra/verify.sh index a0bc897668..bd041d0f46 100755 --- a/scripts/test-infra/verify.sh +++ b/scripts/test-infra/verify.sh @@ -4,7 +4,7 @@ this_dir=`dirname $0` # Install deps gobinpath="$(go env GOPATH)/bin" -curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b "$gobinpath" v1.59.1 +curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b "$gobinpath" v1.60.3 export PATH=$PATH:$(go env GOPATH)/bin curl -sfL https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash -s -- --version v3.15.3 From 91d67937871d6eaaca956ebd0cd8b8143e63beaf Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Fri, 30 Aug 2024 16:42:45 +0300 Subject: [PATCH 2/2] test/e2e: simplify, remove unnecessary check Make golangci-lint happy. --- test/e2e/utils/noderesourcetopology.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/utils/noderesourcetopology.go b/test/e2e/utils/noderesourcetopology.go index b58d29289d..ff15a236c0 100644 --- a/test/e2e/utils/noderesourcetopology.go +++ b/test/e2e/utils/noderesourcetopology.go @@ -228,7 +228,7 @@ func IsValidNodeTopology(nodeTopology *v1alpha2.NodeResourceTopology, kubeletCon return false } - if nodeTopology.Zones == nil || len(nodeTopology.Zones) == 0 { + if len(nodeTopology.Zones) == 0 { framework.Logf("failed to get topology zones from the node topology resource") return false }