Skip to content

Commit 596efd3

Browse files
1gtmtamalsaha
andauthored
[cherry-pick] Use k8s 1.29 client libs (#196) (#199)
/cherry-pick Signed-off-by: Tamal Saha <tamal@appscode.com> Co-authored-by: Tamal Saha <tamal@appscode.com>
1 parent 4e11289 commit 596efd3

File tree

1,792 files changed

+149421
-80662
lines changed

Some content is hidden

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

1,792 files changed

+149421
-80662
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.20
16+
- name: Set up Go 1.21
1717
uses: actions/setup-go@v1
1818
with:
19-
go-version: '1.20'
19+
go-version: '1.21'
2020
id: go
2121

2222
- uses: actions/checkout@v1

Makefile

Lines changed: 2 additions & 2 deletions
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.20
72+
GO_VERSION ?= 1.21
7373
BUILD_IMAGE ?= ghcr.io/appscode/golang-dev:$(GO_VERSION)
7474

7575
OUTBIN = bin/$(OS)_$(ARCH)/$(BIN)
@@ -264,7 +264,7 @@ unit-tests: $(BUILD_DIRS)
264264
./hack/test.sh $(SRC_PKGS) \
265265
"
266266

267-
ADDTL_LINTERS := goconst,gofmt,goimports,unparam
267+
ADDTL_LINTERS := gofmt,goimports,unparam
268268

269269
.PHONY: lint
270270
lint: $(BUILD_DIRS)

go.mod

Lines changed: 62 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,103 +1,108 @@
11
module stash.appscode.dev/redis
22

3-
go 1.18
3+
go 1.21.5
4+
5+
replace github.com/yannh/redis-dump-go => github.com/kubedb/redis-dump-go v0.8.1-ac
46

57
require (
68
github.com/mediocregopher/radix/v3 v3.8.1
79
github.com/spf13/cobra v1.7.0
8-
github.com/yannh/redis-dump-go v0.0.0-00010101000000-000000000000
9-
go.bytebuilders.dev/license-verifier/kubernetes v0.13.2
10+
github.com/yannh/redis-dump-go v0.8.1
11+
go.bytebuilders.dev/license-verifier/kubernetes v0.13.4
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/x v0.0.15
14-
k8s.io/api v0.25.1
15-
k8s.io/apimachinery v0.25.3
16-
k8s.io/client-go v0.25.1
17-
k8s.io/klog/v2 v2.80.1
18-
kmodules.xyz/client-go v0.25.37
19-
kmodules.xyz/custom-resources v0.25.2
20-
kmodules.xyz/offshoot-api v0.25.4
21-
kubedb.dev/apimachinery v0.28.4-0.20220918021210-a0b96812228b
22-
stash.appscode.dev/apimachinery v0.32.0
16+
k8s.io/api v0.29.0
17+
k8s.io/apimachinery v0.29.0
18+
k8s.io/client-go v0.29.0
19+
k8s.io/klog/v2 v2.110.1
20+
kmodules.xyz/client-go v0.29.5
21+
kmodules.xyz/custom-resources v0.29.0
22+
kmodules.xyz/offshoot-api v0.29.0
23+
kubedb.dev/apimachinery v0.40.1-0.20240101000103-032b27211164
24+
stash.appscode.dev/apimachinery v0.32.1-0.20240101013736-ef308633d8b2
2325
)
2426

25-
require github.com/onsi/gomega v1.20.1 // indirect
26-
2727
require (
28-
cloud.google.com/go v0.99.0 // indirect
29-
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
30-
github.com/Azure/go-autorest/autorest v0.11.27 // indirect
31-
github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect
32-
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
33-
github.com/Azure/go-autorest/logger v0.2.1 // indirect
34-
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
3528
github.com/Masterminds/semver/v3 v3.2.1 // indirect
3629
github.com/PuerkitoBio/purell v1.2.0 // indirect
3730
github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2 // indirect
3831
github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 // indirect
39-
github.com/davecgh/go-spew v1.1.1 // indirect
40-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
41-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
42-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
32+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
33+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
34+
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
35+
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
4336
github.com/fatih/structs v1.1.0 // indirect
44-
github.com/go-logr/logr v1.2.3 // indirect
45-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
46-
github.com/go-openapi/jsonreference v0.20.0 // indirect
47-
github.com/go-openapi/swag v0.22.3 // indirect
37+
github.com/go-logr/logr v1.3.0 // indirect
38+
github.com/go-openapi/jsonpointer v0.20.0 // indirect
39+
github.com/go-openapi/jsonreference v0.20.2 // indirect
40+
github.com/go-openapi/swag v0.22.4 // indirect
4841
github.com/gogo/protobuf v1.3.2 // indirect
49-
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
50-
github.com/golang/protobuf v1.5.2 // indirect
51-
github.com/google/gnostic v0.6.9 // indirect
52-
github.com/google/go-cmp v0.5.9 // indirect
42+
github.com/golang/protobuf v1.5.3 // indirect
43+
github.com/google/gnostic-models v0.6.8 // indirect
44+
github.com/google/go-cmp v0.6.0 // indirect
5345
github.com/google/gofuzz v1.2.0 // indirect
46+
github.com/google/uuid v1.4.0 // indirect
5447
github.com/imdario/mergo v0.3.13 // indirect
5548
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5649
github.com/josharian/intern v1.0.0 // indirect
5750
github.com/json-iterator/go v1.1.12 // indirect
5851
github.com/mailru/easyjson v0.7.7 // indirect
52+
github.com/mattn/go-isatty v0.0.18 // indirect
5953
github.com/mitchellh/mapstructure v1.5.0 // indirect
6054
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6155
github.com/modern-go/reflect2 v1.0.2 // indirect
6256
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
57+
github.com/onsi/gomega v1.30.0 // indirect
6358
github.com/pkg/errors v0.9.1 // indirect
59+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
60+
github.com/rogpeppe/go-internal v1.11.0 // indirect
6461
github.com/sergi/go-diff v1.2.0 // indirect
6562
github.com/spf13/pflag v1.0.5 // indirect
6663
github.com/yudai/gojsondiff v1.0.0 // indirect
6764
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
68-
go.bytebuilders.dev/license-proxyserver v0.0.3 // indirect
69-
go.bytebuilders.dev/license-verifier v0.13.2 // indirect
70-
golang.org/x/crypto v0.13.0 // indirect
71-
golang.org/x/net v0.15.0 // indirect
72-
golang.org/x/oauth2 v0.5.0 // indirect
73-
golang.org/x/sys v0.12.0 // indirect
74-
golang.org/x/term v0.12.0 // indirect
75-
golang.org/x/text v0.13.0 // indirect
76-
golang.org/x/time v0.1.0 // indirect
77-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
65+
go.bytebuilders.dev/license-proxyserver v0.0.7-0.20231225202028-31122ab82502 // indirect
66+
go.bytebuilders.dev/license-verifier v0.13.4 // indirect
67+
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
68+
golang.org/x/net v0.19.0 // indirect
69+
golang.org/x/oauth2 v0.15.0 // indirect
70+
golang.org/x/sys v0.15.0 // indirect
71+
golang.org/x/term v0.15.0 // indirect
72+
golang.org/x/text v0.14.0 // indirect
73+
golang.org/x/time v0.5.0 // indirect
74+
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
7875
gomodules.xyz/clock v0.0.0-20200817085942-06523dba733f // indirect
7976
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
8077
gomodules.xyz/mergo v0.3.13 // indirect
8178
gomodules.xyz/pointer v0.1.0 // indirect
8279
gomodules.xyz/sets v0.2.1 // indirect
8380
gomodules.xyz/wait v0.2.0 // indirect
84-
google.golang.org/appengine v1.6.7 // indirect
85-
google.golang.org/protobuf v1.28.1 // indirect
81+
google.golang.org/appengine v1.6.8 // indirect
82+
google.golang.org/protobuf v1.31.0 // indirect
8683
gopkg.in/inf.v0 v0.9.1 // indirect
8784
gopkg.in/yaml.v2 v2.4.0 // indirect
8885
gopkg.in/yaml.v3 v3.0.1 // indirect
89-
k8s.io/apiextensions-apiserver v0.25.1 // indirect
90-
k8s.io/apiserver v0.25.1 // indirect
91-
k8s.io/kube-aggregator v0.25.1 // indirect
92-
k8s.io/kube-openapi v0.0.0-20220803164354-a70c9af30aea // indirect
93-
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73 // indirect
86+
k8s.io/apiextensions-apiserver v0.29.0 // indirect
87+
k8s.io/apiserver v0.29.0 // indirect
88+
k8s.io/kube-aggregator v0.29.0 // indirect
89+
k8s.io/kube-openapi v0.0.0-20231129212854-f0671cc7e66a // indirect
90+
k8s.io/utils v0.0.0-20231127182322-b307cd553661 // indirect
9491
kmodules.xyz/apiversion v0.2.0 // indirect
95-
kmodules.xyz/objectstore-api v0.25.1 // indirect
96-
kmodules.xyz/prober v0.25.0 // indirect
97-
sigs.k8s.io/controller-runtime v0.13.1 // indirect
98-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
99-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
100-
sigs.k8s.io/yaml v1.3.0 // indirect
92+
kmodules.xyz/objectstore-api v0.29.0 // indirect
93+
kmodules.xyz/prober v0.29.0 // indirect
94+
sigs.k8s.io/controller-runtime v0.16.3 // indirect
95+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
96+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
97+
sigs.k8s.io/yaml v1.4.0 // indirect
10198
)
10299

103-
replace github.com/yannh/redis-dump-go => github.com/kubedb/redis-dump-go v0.8.1-ac
100+
replace github.com/Masterminds/sprig/v3 => github.com/gomodules/sprig/v3 v3.2.3-0.20220405051441-0a8a99bac1b8
101+
102+
replace sigs.k8s.io/controller-runtime => github.com/kmodules/controller-runtime v0.16.1-0.20231224083233-bead154270db
103+
104+
replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.6
105+
106+
replace k8s.io/apiserver => github.com/kmodules/apiserver v0.29.1-0.20231224075222-50d5bb4aeb26
107+
108+
replace k8s.io/kubernetes => github.com/kmodules/kubernetes v1.30.0-alpha.0.0.20231224075822-3bd9a13c86db

0 commit comments

Comments
 (0)