Merge pull request #3330 from bobbypage/fixbuild-v046

Fix CI jobs on v0.46
google · Jun 16, 2023 · 1ac3f5c · 1ac3f5c
2 parents ce07bb2 + 4b114e1
commit 1ac3f5c
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 15 deletions.
diff --git a/.golangci.yml b/.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:

diff --git a/Makefile b/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)
 

diff --git a/build/assets.sh b/build/assets.sh
@@ -30,7 +30,7 @@ FORCE="${FORCE:-}" # Force assets to be rebuilt if FORCE=true
 
 # Install while in a temp dir to avoid polluting go.mod/go.sum
 pushd "${TMPDIR:-/tmp}" > /dev/null
-go install github.com/kevinburke/go-bindata/go-bindata@latest
+go install github.com/kevinburke/go-bindata/go-bindata@v3.24.0
 popd > /dev/null
 
 build_asset () {

diff --git a/build/boilerplate/boilerplate.py b/build/boilerplate/boilerplate.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Copyright 2016 Google Inc. All Rights Reserved.
 #

diff --git a/build/boilerplate/boilerplate.py.txt b/build/boilerplate/boilerplate.py.txt
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Copyright YEAR Google Inc. All Rights Reserved.
 #

diff --git a/build/integration-in-docker.sh b/build/integration-in-docker.sh
@@ -29,7 +29,9 @@ function delete() {
 trap delete EXIT INT TERM
 
 function run_tests() {
-  BUILD_CMD="env GOOS=linux GOARCH=amd64 GO_FLAGS='$GO_FLAGS' ./build/build.sh && \
+
+  # Add safe.directory as workaround for https://github.com/actions/runner/issues/2033
+  BUILD_CMD="git config --global safe.directory /go/src/github.com/google/cadvisor && env GOOS=linux GOARCH=amd64 GO_FLAGS='$GO_FLAGS' ./build/build.sh && \
     env GOOS=linux GOFLAGS='$GO_FLAGS' go test -c github.com/google/cadvisor/integration/tests/api && \
     env GOOS=linux GOFLAGS='$GO_FLAGS' go test -c github.com/google/cadvisor/integration/tests/healthz"
 

diff --git a/integration/framework/framework.go b/integration/framework/framework.go
@@ -213,7 +213,7 @@ func (f *realFramework) ClientV2() *v2.Client {
 
 func (a dockerActions) RunPause() string {
 	return a.Run(DockerRunArgs{
-		Image: "kubernetes/pause",
+		Image: "registry.k8s.io/pause",
 	})
 }
 

diff --git a/integration/tests/api/docker_test.go b/integration/tests/api/docker_test.go
@@ -90,7 +90,7 @@ func TestDockerContainerByName(t *testing.T) {
 
 	containerName := fmt.Sprintf("test-docker-container-by-name-%d", os.Getpid())
 	fm.Docker().Run(framework.DockerRunArgs{
-		Image: "kubernetes/pause",
+		Image: "registry.k8s.io/pause",
 		Args:  []string{"--name", containerName},
 	})
 
@@ -150,7 +150,7 @@ func TestBasicDockerContainer(t *testing.T) {
 
 	containerName := fmt.Sprintf("test-basic-docker-container-%d", os.Getpid())
 	containerID := fm.Docker().Run(framework.DockerRunArgs{
-		Image: "kubernetes/pause",
+		Image: "registry.k8s.io/pause",
 		Args: []string{
 			"--name", containerName,
 		},
@@ -183,7 +183,7 @@ func TestDockerContainerSpec(t *testing.T) {
 		cpuShares   = uint64(2048)
 		cpuMask     = "0"
 		memoryLimit = uint64(1 << 30) // 1GB
-		image       = "kubernetes/pause"
+		image       = "registry.k8s.io/pause"
 		env         = map[string]string{"test_var": "FOO"}
 		labels      = map[string]string{"bar": "baz"}
 	)