Merge remote-tracking branch 'upstream/master'

.github/workflows/test.yml

@@ -4,7 +4,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-versions: [1.19, 1.18]
+        go-versions: ['1.20', '1.19']
         platform: [ubuntu-20.04]
         environment-variables: [build/config/plain.sh, build/config/libpfm4.sh, build/config/libipmctl.sh]
     runs-on: ${{ matrix.platform }}
@@ -30,7 +30,7 @@ jobs:
   test-integration:
     strategy:
       matrix:
-        go-versions: [1.19, 1.18]
+        go-versions: ['1.20', '1.19']
         platform: [ubuntu-20.04]
         environment-variables: [build/config/plain.sh, build/config/libpfm4.sh, build/config/libipmctl.sh]
     runs-on: ${{ matrix.platform }}

.golangci.yml

@@ -3,8 +3,6 @@ run:
   linters-settings:
     govet:
       enable-all: true
-    golint:
-      min-confidence: 0
     gofmt:
       simplify: true
     goimports:
@@ -17,12 +15,8 @@ linters:
     - staticcheck
     - unused
     - gosimple
-    - structcheck
-    - varcheck
     - ineffassign
-    - deadcode
     - typecheck
-    - golint
     - gofmt
     - goimports
 issues:

Makefile

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 GO := go
-GOLANGCI_VER := v1.48.0
+GOLANGCI_VER := v1.51.2
 GO_TEST ?= $(GO) test $(or $(GO_FLAGS),-race)
 arch ?= $(shell go env GOARCH)
 
@@ -72,7 +72,7 @@ docker-%:
 	@docker build -t cadvisor:$(shell git rev-parse --short HEAD) -f deploy/Dockerfile .
 
 docker-build:
-	@docker run --rm -w /go/src/github.com/google/cadvisor -v ${PWD}:/go/src/github.com/google/cadvisor golang:1.19 make build
+	@docker run --rm -w /go/src/github.com/google/cadvisor -v ${PWD}:/go/src/github.com/google/cadvisor golang:1.20 make build
 
 presubmit: lint
 	@echo ">> checking go mod tidy"

README.md

@@ -74,7 +74,7 @@ Please reach out and get involved in the project, we're actively looking for mor
 ### Core Team
 * [@bobbypage, Google](https://github.com/bobbypage)
 * [@iwankgb, Independent](https://github.com/iwankgb)
-* [@creatone, Intel](https://github.com/creatone)
+* [@creatone, Independent](https://github.com/creatone)
 * [@dims, VMWare](https://github.com/dims)
 * [@mrunalp, RedHat](https://github.com/mrunalp)