Merge pull request #4079 from cpanato/updates

k8s-ci-robot · web-flow · commit aa6a912b361b · 2025-08-11T01:01:06.000-07:00
bump golangci-lint and allow release-assets.githubusercontent.com
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -32,4 +32,4 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
         with:
-          version: v2.1
+          version: v2.3
diff --git a/.golangci.yml b/.golangci.yml
@@ -81,7 +81,7 @@ linters:
     - usetesting
     - wastedassign
     - whitespace
-    - wsl
+    - wsl_v5
     - zerologlint
     # - cyclop
     # - depguard
diff --git a/cmd/krel/cmd/sign_blobs.go b/cmd/krel/cmd/sign_blobs.go
@@ -141,6 +141,7 @@ func runSignBlobs(signOpts *signOptions, signBlobOpts *signBlobOptions, args []s
 	}
 
 	var tempDir string
+
 	defer func() {
 		if tempDir != "" {
 			os.RemoveAll(tempDir)
diff --git a/cmd/publish-release/cmd/github_test.go b/cmd/publish-release/cmd/github_test.go
@@ -30,9 +30,11 @@ func TestProcessRemoteAsset(t *testing.T) {
 
 	prev := os.Getenv(gacVar)
 	defer t.Setenv(gacVar, prev)
+
 	t.Setenv(gacVar, "")
 
 	files := []string{}
+
 	defer func() {
 		for _, f := range files {
 			os.RemoveAll(f)
diff --git a/dependencies.yaml b/dependencies.yaml
@@ -386,7 +386,7 @@ dependencies:
 
   # golangci-lint-version
   - name: "golangci-lint"
-    version: v2.1
+    version: v2.3
     refPaths:
       - path: .github/workflows/lint.yml
         match: "version: v\\d+.\\d+?\\.?(\\d+)?"
diff --git a/pkg/binary/binary_unit_test.go b/pkg/binary/binary_unit_test.go
@@ -27,6 +27,7 @@ import (
 func TestContainsString(t *testing.T) {
 	tmpfile, err := os.CreateTemp(t.TempDir(), "")
 	require.NoError(t, err)
+
 	defer os.Remove(tmpfile.Name())
 
 	// Decode a fragment of kubectl into a temporary file:
diff --git a/pkg/gcp/build/build.go b/pkg/gcp/build/build.go
@@ -254,6 +254,7 @@ func RunSingleJob(o *Options, jobName, uploaded, version string, subs map[string
 		}
 
 		defer f.Close()
+
 		cmd.AddWriter(f)
 	}
 
@@ -362,6 +363,7 @@ func RunBuildJobs(o *Options) []error {
 	for k, v := range vs {
 		go func(job string, vc map[string]string) {
 			defer w.Done()
+
 			logrus.Infof("Starting job %q...", job)
 
 			if err := RunSingleJob(o, job, uploaded, tag, mergeMaps(extraSubs, vc)); err != nil {
diff --git a/pkg/notes/document/document_test.go b/pkg/notes/document/document_test.go
@@ -279,6 +279,7 @@ func setupTestDir(t *testing.T, dir string) {
 
 func repoTagTarball(t *testing.T, path, repoTag string) {
 	const manifestJSON = "manifest.json"
+
 	manifestJSONPath := filepath.Join(filepath.Dir(path), manifestJSON)
 	require.NoError(t, os.WriteFile(
 		manifestJSONPath,
diff --git a/pkg/notes/notes.go b/pkg/notes/notes.go
@@ -653,6 +653,7 @@ type commitList struct {
 func (l *commitList) Add(c []*gogithub.RepositoryCommit) {
 	l.Lock()
 	defer l.Unlock()
+
 	l.list = append(l.list, c...)
 }
 
@@ -917,6 +918,7 @@ type resultList struct {
 func (l *resultList) Add(r *Result) {
 	l.Lock()
 	defer l.Unlock()
+
 	l.list = append(l.list, r)
 }
 
diff --git a/pkg/release/publish.go b/pkg/release/publish.go
@@ -465,6 +465,7 @@ func (p *Publisher) PublishReleaseNotesIndex(
 		}
 
 		defer os.RemoveAll(tempDir)
+
 		tempIndexFile := filepath.Join(tempDir, releaseNotesIndex)
 
 		if err := p.client.CopyToLocal(
diff --git a/pkg/testgrid/testgrid-scraper.go b/pkg/testgrid/testgrid-scraper.go
@@ -40,6 +40,7 @@ func ReqTestgridDashboardSummaries(ctx context.Context, dashboardNames []Dashboa
 	// Worker
 	requestData := func(done <-chan interface{}, dashboardNames ...DashboardName) <-chan SummaryLookup {
 		summaryLookups := make(chan SummaryLookup)
+
 		go func() {
 			defer close(summaryLookups)
 
@@ -163,6 +164,7 @@ func (d *JobData) Overview() (Overview, error) {
 // UnmarshalTestgridSummary used to unmarshal bytes into TestgridSummary.
 func UnmarshalTestgridSummary(data []byte) (JobData, error) {
 	var r JobData
+
 	err := json.Unmarshal(data, &r)
 
 	return r, err

Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,7 @@ func runSignBlobs(signOpts signOptions, signBlobOpts signBlobOptions, args []s`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`var tempDir string`
	`144`	`+`
`144`	`145`	`defer func() {`
`145`	`146`	`if tempDir != "" {`
`146`	`147`	`os.RemoveAll(tempDir)`
Original file line number	Diff line number	Diff line change
`@@ -254,6 +254,7 @@ func RunSingleJob(o *Options, jobName, uploaded, version string, subs map[string`
`254`	`254`	`}`
`255`	`255`
`256`	`256`	`defer f.Close()`
	`257`	`+`
`257`	`258`	`cmd.AddWriter(f)`
`258`	`259`	`}`
`259`	`260`
`@@ -362,6 +363,7 @@ func RunBuildJobs(o *Options) []error {`
`362`	`363`	`for k, v := range vs {`
`363`	`364`	`go func(job string, vc map[string]string) {`
`364`	`365`	`defer w.Done()`
	`366`	`+`
`365`	`367`	`logrus.Infof("Starting job %q...", job)`
`366`	`368`
`367`	`369`	`if err := RunSingleJob(o, job, uploaded, tag, mergeMaps(extraSubs, vc)); err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -653,6 +653,7 @@ type commitList struct {`
`653`	`653`	`func (l commitList) Add(c []gogithub.RepositoryCommit) {`
`654`	`654`	`l.Lock()`
`655`	`655`	`defer l.Unlock()`
	`656`	`+`
`656`	`657`	`l.list = append(l.list, c...)`
`657`	`658`	`}`
`658`	`659`
`@@ -917,6 +918,7 @@ type resultList struct {`
`917`	`918`	`func (l resultList) Add(r Result) {`
`918`	`919`	`l.Lock()`
`919`	`920`	`defer l.Unlock()`
	`921`	`+`
`920`	`922`	`l.list = append(l.list, r)`
`921`	`923`	`}`
`922`	`924`
Original file line number	Diff line number	Diff line change
`@@ -465,6 +465,7 @@ func (p *Publisher) PublishReleaseNotesIndex(`
`465`	`465`	`}`
`466`	`466`
`467`	`467`	`defer os.RemoveAll(tempDir)`
	`468`	`+`
`468`	`469`	`tempIndexFile := filepath.Join(tempDir, releaseNotesIndex)`
`469`	`470`
`470`	`471`	`if err := p.client.CopyToLocal(`