From 90aebbad3fe3e5e199dda799c14db299313aa4b4 Mon Sep 17 00:00:00 2001 From: David Porter Date: Mon, 27 Mar 2023 16:44:04 -0700 Subject: [PATCH 1/4] Fix asset build Pin the version to v3.24.0 which is working (latest version seems to broken). Signed-off-by: David Porter --- build/assets.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/assets.sh b/build/assets.sh index 7faf33003d..19d7b42546 100755 --- 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 () { From 03da1f34660ba43f1dc3aea64a98b1dea8e1fc7c Mon Sep 17 00:00:00 2001 From: David Porter Date: Fri, 16 Jun 2023 15:25:08 -0700 Subject: [PATCH 2/4] Switch to registry.k8s.io Signed-off-by: David Porter --- integration/framework/framework.go | 2 +- integration/tests/api/docker_test.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/integration/framework/framework.go b/integration/framework/framework.go index e1e099fb43..fdd41fb23b 100644 --- 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 index a775b9b636..665e3af04d 100644 --- 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"} ) From dec4430126e89dea599e7878d04681ee79318194 Mon Sep 17 00:00:00 2001 From: David Porter Date: Sat, 25 Feb 2023 01:54:03 -0800 Subject: [PATCH 3/4] build: Update shebang to python3 Signed-off-by: David Porter --- build/boilerplate/boilerplate.py | 2 +- build/boilerplate/boilerplate.py.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/boilerplate/boilerplate.py b/build/boilerplate/boilerplate.py index ce8a68817a..4a3145014c 100755 --- 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 index 21183f863a..a8011f5df2 100644 --- 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. # From 6416880ce872387a52bf2473ff0671267c2a4d35 Mon Sep 17 00:00:00 2001 From: David Porter Date: Sat, 25 Feb 2023 01:54:26 -0800 Subject: [PATCH 4/4] ci: Update golang ci-lint to v1.51.2 Also, remove the deprecated linters from the .golangci.yml config. Signed-off-by: David Porter --- .golangci.yml | 6 ------ Makefile | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 2bd2b8f0a6..ebfa63d553 100644 --- 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 index 45cbff5ec6..d5fb4abdf8 100644 --- 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)