Skip to content

Commit ba633e8

Browse files
1gtmtamalsaha
andauthored
[cherry-pick] Use k8s 1.29 client libs (#735) (#740)
/cherry-pick Signed-off-by: Tamal Saha <tamal@appscode.com> Co-authored-by: Tamal Saha <tamal@appscode.com>
1 parent 00672e3 commit ba633e8

File tree

1,800 files changed

+146651
-79113
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,800 files changed

+146651
-79113
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

Dockerfile.dbg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ RUN sed -i 's|security.debian.org|archive.debian.org/debian-security|g' /etc/apt
4242
RUN sed -i '/jessie-updates/d' /etc/apt/sources.list
4343

4444
RUN set -x \
45-
&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 467B942D3A79BD29
45+
&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B7B3B788A8D3785C
4646

4747
RUN set -x \
4848
&& apt-get update \

Dockerfile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ RUN sed -i 's|security.debian.org|archive.debian.org/debian-security|g' /etc/apt
4242
RUN sed -i '/jessie-updates/d' /etc/apt/sources.list
4343

4444
RUN set -x \
45-
&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 467B942D3A79BD29
45+
&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B7B3B788A8D3785C
4646

4747
RUN set -x \
4848
&& apt-get update \

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ TAG := $(VERSION)_$(OS)_$(ARCH)
6868
TAG_PROD := $(TAG)
6969
TAG_DBG := $(VERSION)-dbg_$(OS)_$(ARCH)
7070

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

7474
OUTBIN = bin/$(OS)_$(ARCH)/$(BIN)
7575
ifeq ($(OS),windows)
@@ -262,7 +262,7 @@ unit-tests: $(BUILD_DIRS)
262262
./hack/test.sh $(SRC_PKGS) \
263263
"
264264

265-
ADDTL_LINTERS := goconst,gofmt,goimports,unparam
265+
ADDTL_LINTERS := gofmt,goimports,unparam
266266

267267
.PHONY: lint
268268
lint: $(BUILD_DIRS)

go.mod

Lines changed: 59 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,102 @@
11
module stash.appscode.dev/mysql
22

3-
go 1.18
3+
go 1.21.5
44

55
require (
66
github.com/spf13/cobra v1.7.0
7-
go.bytebuilders.dev/license-verifier/kubernetes v0.13.2
7+
go.bytebuilders.dev/license-verifier/kubernetes v0.13.4
88
gomodules.xyz/flags v0.1.3
99
gomodules.xyz/go-sh v0.1.0
1010
gomodules.xyz/logs v0.0.7
1111
gomodules.xyz/x v0.0.15
12-
k8s.io/apimachinery v0.25.3
13-
k8s.io/client-go v0.25.1
14-
k8s.io/klog/v2 v2.80.1
15-
kmodules.xyz/client-go v0.25.37
16-
kmodules.xyz/custom-resources v0.25.2
17-
kmodules.xyz/offshoot-api v0.25.4
18-
stash.appscode.dev/apimachinery v0.32.0
12+
k8s.io/apimachinery v0.29.0
13+
k8s.io/client-go v0.29.0
14+
k8s.io/klog/v2 v2.110.1
15+
kmodules.xyz/client-go v0.29.5
16+
kmodules.xyz/custom-resources v0.29.0
17+
kmodules.xyz/offshoot-api v0.29.0
18+
stash.appscode.dev/apimachinery v0.32.1-0.20240101013736-ef308633d8b2
1919
)
2020

21-
require github.com/onsi/gomega v1.20.1 // indirect
22-
2321
require (
24-
cloud.google.com/go v0.97.0 // indirect
25-
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
26-
github.com/Azure/go-autorest/autorest v0.11.27 // indirect
27-
github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect
28-
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
29-
github.com/Azure/go-autorest/logger v0.2.1 // indirect
30-
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
3122
github.com/Masterminds/semver/v3 v3.2.1 // indirect
3223
github.com/PuerkitoBio/purell v1.2.0 // indirect
3324
github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2 // indirect
3425
github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 // indirect
35-
github.com/davecgh/go-spew v1.1.1 // indirect
36-
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
37-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
38-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
26+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
27+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
28+
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
29+
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
3930
github.com/fatih/structs v1.1.0 // indirect
40-
github.com/go-logr/logr v1.2.3 // indirect
41-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
42-
github.com/go-openapi/jsonreference v0.20.0 // indirect
43-
github.com/go-openapi/swag v0.19.15 // indirect
31+
github.com/go-logr/logr v1.3.0 // indirect
32+
github.com/go-openapi/jsonpointer v0.20.0 // indirect
33+
github.com/go-openapi/jsonreference v0.20.2 // indirect
34+
github.com/go-openapi/swag v0.22.4 // indirect
4435
github.com/gogo/protobuf v1.3.2 // indirect
45-
github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
46-
github.com/golang/protobuf v1.5.2 // indirect
47-
github.com/google/gnostic v0.5.7-v3refs // indirect
48-
github.com/google/go-cmp v0.5.9 // indirect
36+
github.com/golang/protobuf v1.5.3 // indirect
37+
github.com/google/gnostic-models v0.6.8 // indirect
38+
github.com/google/go-cmp v0.6.0 // indirect
4939
github.com/google/gofuzz v1.2.0 // indirect
40+
github.com/google/uuid v1.4.0 // indirect
5041
github.com/imdario/mergo v0.3.13 // indirect
5142
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5243
github.com/josharian/intern v1.0.0 // indirect
5344
github.com/json-iterator/go v1.1.12 // indirect
54-
github.com/mailru/easyjson v0.7.6 // indirect
45+
github.com/mailru/easyjson v0.7.7 // indirect
46+
github.com/mattn/go-isatty v0.0.18 // indirect
5547
github.com/mitchellh/mapstructure v1.5.0 // indirect
5648
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5749
github.com/modern-go/reflect2 v1.0.2 // indirect
5850
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
51+
github.com/onsi/gomega v1.30.0 // indirect
5952
github.com/pkg/errors v0.9.1 // indirect
53+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
54+
github.com/rogpeppe/go-internal v1.11.0 // indirect
6055
github.com/sergi/go-diff v1.2.0 // indirect
6156
github.com/spf13/pflag v1.0.5 // indirect
6257
github.com/yudai/gojsondiff v1.0.0 // indirect
6358
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
64-
go.bytebuilders.dev/license-proxyserver v0.0.3 // indirect
65-
go.bytebuilders.dev/license-verifier v0.13.2 // indirect
66-
golang.org/x/crypto v0.13.0 // indirect
67-
golang.org/x/net v0.15.0 // indirect
68-
golang.org/x/oauth2 v0.5.0 // indirect
69-
golang.org/x/sys v0.12.0 // indirect
70-
golang.org/x/term v0.12.0 // indirect
71-
golang.org/x/text v0.13.0 // indirect
72-
golang.org/x/time v0.1.0 // indirect
59+
go.bytebuilders.dev/license-proxyserver v0.0.7-0.20231225202028-31122ab82502 // indirect
60+
go.bytebuilders.dev/license-verifier v0.13.4 // indirect
61+
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
62+
golang.org/x/net v0.19.0 // indirect
63+
golang.org/x/oauth2 v0.15.0 // indirect
64+
golang.org/x/sys v0.15.0 // indirect
65+
golang.org/x/term v0.15.0 // indirect
66+
golang.org/x/text v0.14.0 // indirect
67+
golang.org/x/time v0.5.0 // indirect
7368
gomodules.xyz/clock v0.0.0-20200817085942-06523dba733f // indirect
7469
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
7570
gomodules.xyz/mergo v0.3.13 // indirect
7671
gomodules.xyz/pointer v0.1.0 // indirect
7772
gomodules.xyz/sets v0.2.1 // indirect
7873
gomodules.xyz/wait v0.2.0 // indirect
79-
google.golang.org/appengine v1.6.7 // indirect
80-
google.golang.org/protobuf v1.28.1 // indirect
74+
google.golang.org/appengine v1.6.8 // indirect
75+
google.golang.org/protobuf v1.31.0 // indirect
8176
gopkg.in/inf.v0 v0.9.1 // indirect
8277
gopkg.in/yaml.v2 v2.4.0 // indirect
8378
gopkg.in/yaml.v3 v3.0.1 // indirect
84-
k8s.io/api v0.25.1 // indirect
85-
k8s.io/apiextensions-apiserver v0.25.1 // indirect
86-
k8s.io/apiserver v0.25.1 // indirect
87-
k8s.io/kube-aggregator v0.25.1 // indirect
88-
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
89-
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73 // indirect
79+
k8s.io/api v0.29.0 // indirect
80+
k8s.io/apiextensions-apiserver v0.29.0 // indirect
81+
k8s.io/apiserver v0.29.0 // indirect
82+
k8s.io/kube-aggregator v0.29.0 // indirect
83+
k8s.io/kube-openapi v0.0.0-20231129212854-f0671cc7e66a // indirect
84+
k8s.io/utils v0.0.0-20231127182322-b307cd553661 // indirect
9085
kmodules.xyz/apiversion v0.2.0 // indirect
91-
kmodules.xyz/objectstore-api v0.25.1 // indirect
92-
kmodules.xyz/prober v0.25.0 // indirect
93-
sigs.k8s.io/controller-runtime v0.13.1 // indirect
94-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
95-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
96-
sigs.k8s.io/yaml v1.3.0 // indirect
86+
kmodules.xyz/objectstore-api v0.29.0 // indirect
87+
kmodules.xyz/prober v0.29.0 // indirect
88+
sigs.k8s.io/controller-runtime v0.16.3 // indirect
89+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
90+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
91+
sigs.k8s.io/yaml v1.4.0 // indirect
9792
)
93+
94+
replace github.com/Masterminds/sprig/v3 => github.com/gomodules/sprig/v3 v3.2.3-0.20220405051441-0a8a99bac1b8
95+
96+
replace sigs.k8s.io/controller-runtime => github.com/kmodules/controller-runtime v0.16.1-0.20231224083233-bead154270db
97+
98+
replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.6
99+
100+
replace k8s.io/apiserver => github.com/kmodules/apiserver v0.29.1-0.20231224075222-50d5bb4aeb26
101+
102+
replace k8s.io/kubernetes => github.com/kmodules/kubernetes v1.30.0-alpha.0.0.20231224075822-3bd9a13c86db

0 commit comments

Comments
 (0)