Skip to content

Commit 57359de

Browse files
authored
Use Go 1.22 (#198)
/cherry-pick Signed-off-by: Tamal Saha <[email protected]>
1 parent cc9996a commit 57359de

File tree

190 files changed

+12274
-3457
lines changed

Some content is hidden

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

190 files changed

+12274
-3457
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818
name: Build
1919
runs-on: ubuntu-20.04
2020
steps:
21-
- name: Set up Go 1.21
21+
- name: Set up Go 1.22
2222
uses: actions/setup-go@v1
2323
with:
24-
go-version: '1.21'
24+
go-version: '1.22'
2525
id: go
2626

2727
- name: Check out code into the Go module directory

.github/workflows/update-docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515
name: Build
1616
runs-on: ubuntu-20.04
1717
steps:
18-
- name: Set up Go 1.21
18+
- name: Set up Go 1.22
1919
uses: actions/setup-go@v1
2020
with:
21-
go-version: '1.21'
21+
go-version: '1.22'
2222
id: go
2323

2424
- uses: actions/checkout@v1

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ BIN_PLATFORMS := $(DOCKER_PLATFORMS) windows/amd64 darwin/amd64 darwin/arm64
5353
OS := $(if $(GOOS),$(GOOS),$(shell go env GOOS))
5454
ARCH := $(if $(GOARCH),$(GOARCH),$(shell go env GOARCH))
5555

56-
GO_VERSION ?= 1.21
56+
GO_VERSION ?= 1.22
5757
BUILD_IMAGE ?= ghcr.io/appscode/golang-dev:$(GO_VERSION)
5858

5959
RESTIC_VER := 0.13.1
@@ -220,7 +220,7 @@ lint: $(BUILD_DIRS)
220220
--env GO111MODULE=on \
221221
--env GOFLAGS="-mod=vendor" \
222222
$(BUILD_IMAGE) \
223-
golangci-lint run --enable $(ADDTL_LINTERS) --deadline=10m --skip-files="generated.*\.go$\" --skip-dirs-use-default
223+
golangci-lint run --enable $(ADDTL_LINTERS) --timeout=10m --skip-files="generated.*\.go$\" --skip-dirs-use-default
224224

225225
$(BUILD_DIRS):
226226
@mkdir -p $@

go.mod

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,28 @@
11
module stash.appscode.dev/cli
22

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

57
require (
68
github.com/kubernetes-csi/external-snapshotter/client/v7 v7.0.0
79
github.com/pkg/errors v0.9.1
8-
github.com/spf13/cobra v1.7.0
10+
github.com/spf13/cobra v1.8.0
911
golang.org/x/text v0.14.0
1012
gomodules.xyz/flags v0.1.3
1113
gomodules.xyz/go-sh v0.1.0
1214
gomodules.xyz/logs v0.0.7
1315
gomodules.xyz/pointer v0.1.0
1416
gomodules.xyz/runtime v0.3.0
15-
gomodules.xyz/x v0.0.15
16-
k8s.io/api v0.29.0
17-
k8s.io/apimachinery v0.29.0
18-
k8s.io/cli-runtime v0.29.0
19-
k8s.io/client-go v0.29.0
20-
k8s.io/klog/v2 v2.110.1
21-
k8s.io/kube-aggregator v0.29.0
17+
gomodules.xyz/x v0.0.17
18+
k8s.io/api v0.29.2
19+
k8s.io/apimachinery v0.29.2
20+
k8s.io/cli-runtime v0.29.2
21+
k8s.io/client-go v0.29.2
22+
k8s.io/klog/v2 v2.120.1
23+
k8s.io/kube-aggregator v0.29.2
2224
k8s.io/kubectl v0.29.0
23-
kmodules.xyz/client-go v0.29.7
25+
kmodules.xyz/client-go v0.29.13
2426
kmodules.xyz/csi-utils v0.29.1
2527
kmodules.xyz/objectstore-api v0.29.1
2628
kmodules.xyz/offshoot-api v0.29.0
@@ -40,7 +42,7 @@ require (
4042
github.com/cespare/xxhash/v2 v2.2.0 // indirect
4143
github.com/chai2010/gettext-go v1.0.2 // indirect
4244
github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 // indirect
43-
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
45+
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
4446
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
4547
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
4648
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
@@ -57,19 +59,20 @@ require (
5759
github.com/go-sql-driver/mysql v1.7.1 // indirect
5860
github.com/gogo/protobuf v1.3.2 // indirect
5961
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
60-
github.com/golang/protobuf v1.5.3 // indirect
61-
github.com/google/btree v1.0.1 // indirect
62+
github.com/golang/protobuf v1.5.4 // indirect
63+
github.com/google/btree v1.1.2 // indirect
6264
github.com/google/gnostic-models v0.6.8 // indirect
6365
github.com/google/go-cmp v0.6.0 // indirect
6466
github.com/google/gofuzz v1.2.0 // indirect
6567
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
66-
github.com/google/uuid v1.4.0 // indirect
68+
github.com/google/uuid v1.6.0 // indirect
6769
github.com/gorilla/websocket v1.5.0 // indirect
6870
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
69-
github.com/imdario/mergo v0.3.13 // indirect
71+
github.com/imdario/mergo v0.3.16 // indirect
7072
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7173
github.com/josharian/intern v1.0.0 // indirect
7274
github.com/json-iterator/go v1.1.12 // indirect
75+
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
7376
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
7477
github.com/mailru/easyjson v0.7.7 // indirect
7578
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
@@ -82,7 +85,7 @@ require (
8285
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
8386
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8487
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
85-
github.com/onsi/gomega v1.30.0 // indirect
88+
github.com/onsi/gomega v1.31.1 // indirect
8689
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
8790
github.com/prometheus/client_golang v1.18.0 // indirect
8891
github.com/prometheus/client_model v0.5.0 // indirect
@@ -94,33 +97,34 @@ require (
9497
github.com/xlab/treeprint v1.2.0 // indirect
9598
github.com/yudai/gojsondiff v1.0.0 // indirect
9699
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
100+
github.com/zeebo/xxh3 v1.0.2 // indirect
97101
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
98102
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
99-
golang.org/x/net v0.19.0 // indirect
103+
golang.org/x/net v0.21.0 // indirect
100104
golang.org/x/oauth2 v0.15.0 // indirect
101105
golang.org/x/sync v0.5.0 // indirect
102-
golang.org/x/sys v0.16.0 // indirect
103-
golang.org/x/term v0.15.0 // indirect
106+
golang.org/x/sys v0.17.0 // indirect
107+
golang.org/x/term v0.17.0 // indirect
104108
golang.org/x/time v0.5.0 // indirect
105109
gomodules.xyz/clock v0.0.0-20200817085942-06523dba733f // indirect
106110
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
107111
gomodules.xyz/mergo v0.3.13 // indirect
108112
gomodules.xyz/sets v0.2.1 // indirect
109113
gomodules.xyz/wait v0.2.0 // indirect
110114
google.golang.org/appengine v1.6.8 // indirect
111-
google.golang.org/protobuf v1.31.0 // indirect
115+
google.golang.org/protobuf v1.33.0 // indirect
112116
gopkg.in/inf.v0 v0.9.1 // indirect
113117
gopkg.in/yaml.v2 v2.4.0 // indirect
114118
gopkg.in/yaml.v3 v3.0.1 // indirect
115-
k8s.io/apiextensions-apiserver v0.29.0 // indirect
116-
k8s.io/apiserver v0.29.0 // indirect
117-
k8s.io/component-base v0.29.0 // indirect
118-
k8s.io/kube-openapi v0.0.0-20231129212854-f0671cc7e66a // indirect
119-
k8s.io/utils v0.0.0-20231127182322-b307cd553661 // indirect
119+
k8s.io/apiextensions-apiserver v0.29.2 // indirect
120+
k8s.io/apiserver v0.29.2 // indirect
121+
k8s.io/component-base v0.29.2 // indirect
122+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
123+
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
120124
kmodules.xyz/custom-resources v0.29.1 // indirect
121125
kmodules.xyz/prober v0.29.0 // indirect
122126
kmodules.xyz/webhook-runtime v0.29.1 // indirect
123-
sigs.k8s.io/controller-runtime v0.17.0 // indirect
127+
sigs.k8s.io/controller-runtime v0.17.2 // indirect
124128
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
125129
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
126130
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect

0 commit comments

Comments
 (0)