Skip to content

Commit 1f3097e

Browse files
1gtmtamalsaha
andauthored
[cherry-pick] Use Go 1.22 (#1510) (#1513)
/cherry-pick Signed-off-by: Tamal Saha <tamal@appscode.com> Co-authored-by: Tamal Saha <tamal@appscode.com>
1 parent 9210422 commit 1f3097e

File tree

180 files changed

+11186
-3068
lines changed

Some content is hidden

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

180 files changed

+11186
-3068
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
name: Build
1414
runs-on: ubuntu-20.04
1515
steps:
16-
- name: Set up Go 1.21
16+
- name: Set up Go 1.22
1717
uses: actions/setup-go@v1
1818
with:
19-
go-version: '1.21'
19+
go-version: '1.22'
2020
id: go
2121

2222
- uses: actions/checkout@v1

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ TAG := $(VERSION)_$(OS)_$(ARCH)
6969
TAG_PROD := $(TAG)
7070
TAG_DBG := $(VERSION)-dbg_$(OS)_$(ARCH)
7171

72-
GO_VERSION ?= 1.21
72+
GO_VERSION ?= 1.22
7373
BUILD_IMAGE ?= ghcr.io/appscode/golang-dev:$(GO_VERSION)
7474

7575
OUTBIN = bin/$(OS)_$(ARCH)/$(BIN)

go.mod

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

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

57
require (
6-
github.com/spf13/cobra v1.7.0
7-
go.bytebuilders.dev/license-verifier/kubernetes v0.13.4
8+
github.com/spf13/cobra v1.8.0
9+
go.bytebuilders.dev/license-verifier/kubernetes v0.14.0
810
gomodules.xyz/flags v0.1.3
911
gomodules.xyz/go-sh v0.1.0
1012
gomodules.xyz/logs v0.0.7
11-
gomodules.xyz/x v0.0.15
12-
k8s.io/api v0.29.0
13-
k8s.io/apimachinery v0.29.0
14-
k8s.io/client-go v0.29.0
15-
k8s.io/klog/v2 v2.110.1
16-
kmodules.xyz/client-go v0.29.7
13+
gomodules.xyz/x v0.0.17
14+
k8s.io/api v0.29.2
15+
k8s.io/apimachinery v0.29.2
16+
k8s.io/client-go v0.29.2
17+
k8s.io/klog/v2 v2.120.1
18+
kmodules.xyz/client-go v0.29.13
1719
kmodules.xyz/custom-resources v0.29.1
1820
kmodules.xyz/offshoot-api v0.29.0
1921
stash.appscode.dev/apimachinery v0.33.0
2022
)
2123

24+
require (
25+
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
26+
github.com/zeebo/xxh3 v1.0.2 // indirect
27+
)
28+
2229
require (
2330
github.com/Masterminds/semver/v3 v3.2.1 // indirect
24-
github.com/PuerkitoBio/purell v1.2.0 // indirect
31+
github.com/PuerkitoBio/purell v1.2.1 // indirect
2532
github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2 // indirect
2633
github.com/beorn7/perks v1.0.1 // indirect
2734
github.com/cespare/xxhash/v2 v2.2.0 // indirect
@@ -39,24 +46,22 @@ require (
3946
github.com/go-sql-driver/mysql v1.7.1 // indirect
4047
github.com/gogo/protobuf v1.3.2 // indirect
4148
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
42-
github.com/golang/protobuf v1.5.3 // indirect
49+
github.com/golang/protobuf v1.5.4 // indirect
4350
github.com/google/gnostic-models v0.6.8 // indirect
4451
github.com/google/go-cmp v0.6.0 // indirect
4552
github.com/google/gofuzz v1.2.0 // indirect
46-
github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 // indirect
47-
github.com/google/uuid v1.4.0 // indirect
48-
github.com/imdario/mergo v0.3.13 // indirect
53+
github.com/google/uuid v1.6.0 // indirect
54+
github.com/imdario/mergo v0.3.16 // indirect
4955
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5056
github.com/josharian/intern v1.0.0 // indirect
5157
github.com/json-iterator/go v1.1.12 // indirect
5258
github.com/mailru/easyjson v0.7.7 // indirect
53-
github.com/mattn/go-isatty v0.0.18 // indirect
5459
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
5560
github.com/mitchellh/mapstructure v1.5.0 // indirect
5661
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5762
github.com/modern-go/reflect2 v1.0.2 // indirect
5863
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
59-
github.com/onsi/gomega v1.30.0 // indirect
64+
github.com/onsi/gomega v1.31.1 // indirect
6065
github.com/pkg/errors v0.9.1 // indirect
6166
github.com/prometheus/client_golang v1.18.0 // indirect
6267
github.com/prometheus/client_model v0.5.0 // indirect
@@ -66,13 +71,13 @@ require (
6671
github.com/spf13/pflag v1.0.5 // indirect
6772
github.com/yudai/gojsondiff v1.0.0 // indirect
6873
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
69-
go.bytebuilders.dev/license-proxyserver v0.0.7-0.20231225202028-31122ab82502 // indirect
70-
go.bytebuilders.dev/license-verifier v0.13.4 // indirect
74+
go.bytebuilders.dev/license-proxyserver v0.0.9 // indirect
75+
go.bytebuilders.dev/license-verifier v0.14.0 // indirect
7176
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
72-
golang.org/x/net v0.19.0 // indirect
77+
golang.org/x/net v0.21.0 // indirect
7378
golang.org/x/oauth2 v0.15.0 // indirect
74-
golang.org/x/sys v0.16.0 // indirect
75-
golang.org/x/term v0.15.0 // indirect
79+
golang.org/x/sys v0.17.0 // indirect
80+
golang.org/x/term v0.17.0 // indirect
7681
golang.org/x/text v0.14.0 // indirect
7782
golang.org/x/time v0.5.0 // indirect
7883
gomodules.xyz/clock v0.0.0-20200817085942-06523dba733f // indirect
@@ -82,21 +87,20 @@ require (
8287
gomodules.xyz/sets v0.2.1 // indirect
8388
gomodules.xyz/wait v0.2.0 // indirect
8489
google.golang.org/appengine v1.6.8 // indirect
85-
google.golang.org/protobuf v1.31.0 // indirect
90+
google.golang.org/protobuf v1.33.0 // indirect
8691
gopkg.in/inf.v0 v0.9.1 // indirect
87-
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
8892
gopkg.in/yaml.v2 v2.4.0 // indirect
8993
gopkg.in/yaml.v3 v3.0.1 // indirect
90-
k8s.io/apiextensions-apiserver v0.29.0 // indirect
91-
k8s.io/apiserver v0.29.0 // indirect
92-
k8s.io/component-base v0.29.0 // indirect
93-
k8s.io/kube-aggregator v0.29.0 // indirect
94-
k8s.io/kube-openapi v0.0.0-20231129212854-f0671cc7e66a // indirect
95-
k8s.io/utils v0.0.0-20231127182322-b307cd553661 // indirect
94+
k8s.io/apiextensions-apiserver v0.29.2 // indirect
95+
k8s.io/apiserver v0.29.2 // indirect
96+
k8s.io/component-base v0.29.2 // indirect
97+
k8s.io/kube-aggregator v0.29.2 // indirect
98+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
99+
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
96100
kmodules.xyz/apiversion v0.2.0 // indirect
97101
kmodules.xyz/objectstore-api v0.29.1 // indirect
98102
kmodules.xyz/prober v0.29.0 // indirect
99-
sigs.k8s.io/controller-runtime v0.17.0 // indirect
103+
sigs.k8s.io/controller-runtime v0.17.2 // indirect
100104
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
101105
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
102106
sigs.k8s.io/yaml v1.4.0 // indirect

0 commit comments

Comments
 (0)