Skip to content

Commit 50bdee0

Browse files
authored
Merge pull request #168 from digitalocean/ihwang/update-go-mod
update go version to 1.22, tidy and vendor
2 parents fc440ef + ab64d5d commit 50bdee0

File tree

428 files changed

+49939
-24613
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

428 files changed

+49939
-24613
lines changed

.circleci/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@ version: 2
22
jobs:
33
license:
44
docker:
5-
- image: golang:1.21
5+
- image: golang:1.22
66
steps:
77
- checkout
88
- run: ./script/check-licenses.sh
99
vet:
1010
docker:
11-
- image: golang:1.21
11+
- image: golang:1.22
1212
steps:
1313
- checkout
1414
- run: go vet ./...
1515
test:
1616
docker:
17-
- image: golang:1.21
17+
- image: golang:1.22
1818
steps:
1919
- checkout
2020
- run: go test -race -cover ./...
2121
smoke-test:
2222
docker:
23-
- image: golang:1.21
23+
- image: golang:1.22
2424
steps:
2525
- checkout
2626
- run: go run ./cmd/clusterlint --help

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Install go
1818
uses: actions/setup-go@0caeaed6fd66a828038c2da3c0f662a42862658f
1919
with:
20-
go-version: ^1.21
20+
go-version: go.mod
2121
- name: Check out code into the Go module directory
2222
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
2323
- name: Login to dockerhub to push the image

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the clusterlint binary
2-
FROM golang:1.21 as builder
2+
FROM golang:1.22 as builder
33
WORKDIR /workspace
44
# Copy the Go Modules manifests
55
COPY go.mod go.mod

go.mod

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,36 @@
11
module github.com/digitalocean/clusterlint
22

3-
go 1.21
3+
go 1.22.0
4+
5+
toolchain go1.22.2
46

57
require (
68
github.com/docker/distribution v2.8.3+incompatible
79
github.com/fatih/color v1.16.0
810
github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0
9-
github.com/stretchr/testify v1.8.4
10-
github.com/urfave/cli v1.22.14
11-
golang.org/x/sync v0.6.0
12-
k8s.io/api v0.29.0
13-
k8s.io/apimachinery v0.29.0
14-
k8s.io/client-go v0.29.0
11+
github.com/stretchr/testify v1.9.0
12+
github.com/urfave/cli v1.22.15
13+
golang.org/x/sync v0.7.0
14+
k8s.io/api v0.30.0
15+
k8s.io/apimachinery v0.30.0
16+
k8s.io/client-go v0.30.0
1517
)
1618

1719
require (
18-
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
20+
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
1921
github.com/davecgh/go-spew v1.1.1 // indirect
20-
github.com/distribution/reference v0.5.0 // indirect
21-
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
22+
github.com/distribution/reference v0.6.0 // indirect
23+
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
2224
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
2325
github.com/go-logr/logr v1.4.1 // indirect
24-
github.com/go-openapi/jsonpointer v0.20.2 // indirect
25-
github.com/go-openapi/jsonreference v0.20.4 // indirect
26-
github.com/go-openapi/swag v0.22.7 // indirect
26+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
27+
github.com/go-openapi/jsonreference v0.21.0 // indirect
28+
github.com/go-openapi/swag v0.23.0 // indirect
2729
github.com/gogo/protobuf v1.3.2 // indirect
28-
github.com/golang/protobuf v1.5.3 // indirect
30+
github.com/golang/protobuf v1.5.4 // indirect
2931
github.com/google/gnostic-models v0.6.8 // indirect
3032
github.com/google/gofuzz v1.2.0 // indirect
31-
github.com/google/uuid v1.5.0 // indirect
33+
github.com/google/uuid v1.6.0 // indirect
3234
github.com/imdario/mergo v0.3.16 // indirect
3335
github.com/josharian/intern v1.0.0 // indirect
3436
github.com/json-iterator/go v1.1.12 // indirect
@@ -43,21 +45,22 @@ require (
4345
github.com/pmezard/go-difflib v1.0.0 // indirect
4446
github.com/russross/blackfriday/v2 v2.1.0 // indirect
4547
github.com/spf13/pflag v1.0.5 // indirect
46-
golang.org/x/net v0.20.0 // indirect
47-
golang.org/x/oauth2 v0.16.0 // indirect
48-
golang.org/x/sys v0.16.0 // indirect
49-
golang.org/x/term v0.16.0 // indirect
50-
golang.org/x/text v0.14.0 // indirect
48+
golang.org/x/net v0.25.0 // indirect
49+
golang.org/x/oauth2 v0.20.0 // indirect
50+
golang.org/x/sys v0.20.0 // indirect
51+
golang.org/x/term v0.20.0 // indirect
52+
golang.org/x/text v0.15.0 // indirect
5153
golang.org/x/time v0.5.0 // indirect
52-
google.golang.org/appengine v1.6.8 // indirect
53-
google.golang.org/protobuf v1.32.0 // indirect
54+
google.golang.org/protobuf v1.34.1 // indirect
5455
gopkg.in/inf.v0 v0.9.1 // indirect
5556
gopkg.in/yaml.v2 v2.4.0 // indirect
5657
gopkg.in/yaml.v3 v3.0.1 // indirect
57-
k8s.io/klog/v2 v2.120.0 // indirect
58-
k8s.io/kube-openapi v0.0.0-20240105020646-a37d4de58910 // indirect
59-
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
58+
k8s.io/klog/v2 v2.120.1 // indirect
59+
k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f // indirect
60+
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
6061
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
6162
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
6263
sigs.k8s.io/yaml v1.4.0 // indirect
6364
)
65+
66+
replace github.com/distribution/reference => github.com/distribution/reference v0.5.0

0 commit comments

Comments
 (0)