Skip to content

Commit 2fa9872

Browse files
authored
Use k8s 1.29 client libs (#192)
/cherry-pick Signed-off-by: Tamal Saha <tamal@appscode.com>
1 parent 575a83d commit 2fa9872

File tree

2,194 files changed

+196123
-128214
lines changed

Some content is hidden

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

2,194 files changed

+196123
-128214
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.20
21+
- name: Set up Go 1.21
2222
uses: actions/setup-go@v1
2323
with:
24-
go-version: '1.20'
24+
go-version: '1.21'
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.20
18+
- name: Set up Go 1.21
1919
uses: actions/setup-go@v1
2020
with:
21-
go-version: '1.20'
21+
go-version: '1.21'
2222
id: go
2323

2424
- uses: actions/checkout@v1

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ 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.20
57-
BUILD_IMAGE ?= appscode/golang-dev:$(GO_VERSION)
56+
GO_VERSION ?= 1.21
57+
BUILD_IMAGE ?= ghcr.io/appscode/golang-dev:$(GO_VERSION)
5858

5959
RESTIC_VER := 0.13.1
6060

@@ -201,7 +201,7 @@ unit-tests: $(BUILD_DIRS)
201201
./hack/test.sh $(SRC_PKGS) \
202202
"
203203

204-
ADDTL_LINTERS := goconst,gofmt,goimports,unparam
204+
ADDTL_LINTERS := gofmt,goimports,unparam
205205

206206
.PHONY: lint
207207
lint: $(BUILD_DIRS)

go.mod

Lines changed: 74 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,131 +1,134 @@
11
module stash.appscode.dev/cli
22

3-
go 1.18
3+
go 1.21.5
44

55
require (
6-
github.com/evanphx/json-patch v4.12.0+incompatible
6+
github.com/evanphx/json-patch v5.7.0+incompatible
77
github.com/json-iterator/go v1.1.12
88
github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0
99
github.com/pkg/errors v0.9.1
1010
github.com/spf13/cobra v1.7.0
11-
golang.org/x/text v0.13.0
11+
golang.org/x/text v0.14.0
1212
gomodules.xyz/flags v0.1.3
1313
gomodules.xyz/go-sh v0.1.0
1414
gomodules.xyz/logs v0.0.7
1515
gomodules.xyz/pointer v0.1.0
1616
gomodules.xyz/runtime v0.3.0
1717
gomodules.xyz/x v0.0.15
18-
k8s.io/api v0.25.1
19-
k8s.io/apimachinery v0.25.3
20-
k8s.io/cli-runtime v0.25.1
21-
k8s.io/client-go v0.25.1
22-
k8s.io/klog/v2 v2.80.1
23-
k8s.io/kube-aggregator v0.25.1
24-
k8s.io/kubectl v0.25.1
25-
kmodules.xyz/client-go v0.25.37
26-
kmodules.xyz/objectstore-api v0.25.1
27-
kmodules.xyz/offshoot-api v0.25.4
28-
kmodules.xyz/openshift v0.25.0
29-
sigs.k8s.io/yaml v1.3.0
30-
stash.appscode.dev/apimachinery v0.32.0
31-
stash.appscode.dev/stash v0.32.0
18+
k8s.io/api v0.29.0
19+
k8s.io/apimachinery v0.29.0
20+
k8s.io/cli-runtime v0.29.0
21+
k8s.io/client-go v0.29.0
22+
k8s.io/klog/v2 v2.110.1
23+
k8s.io/kube-aggregator v0.29.0
24+
k8s.io/kubectl v0.29.0
25+
kmodules.xyz/client-go v0.29.4
26+
kmodules.xyz/objectstore-api v0.29.0
27+
kmodules.xyz/offshoot-api v0.29.0
28+
kmodules.xyz/openshift v0.29.0
29+
sigs.k8s.io/yaml v1.4.0
30+
stash.appscode.dev/apimachinery v0.32.1-0.20240101013736-ef308633d8b2
31+
stash.appscode.dev/stash v0.32.1-0.20240101020332-2b252fac5533
3232
)
3333

3434
require (
35-
cloud.google.com/go v0.99.0 // indirect
3635
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
37-
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
38-
github.com/Azure/go-autorest/autorest v0.11.27 // indirect
39-
github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect
40-
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
41-
github.com/Azure/go-autorest/logger v0.2.1 // indirect
42-
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
4336
github.com/MakeNowJust/heredoc v1.0.0 // indirect
4437
github.com/Masterminds/semver/v3 v3.2.1 // indirect
45-
github.com/PuerkitoBio/purell v1.2.0 // indirect
4638
github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2 // indirect
4739
github.com/beorn7/perks v1.0.1 // indirect
4840
github.com/blang/semver/v4 v4.0.0 // indirect
4941
github.com/cespare/xxhash/v2 v2.2.0 // indirect
5042
github.com/chai2010/gettext-go v1.0.2 // indirect
5143
github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 // indirect
5244
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
53-
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
54-
github.com/davecgh/go-spew v1.1.1 // indirect
55-
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
56-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
45+
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
46+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
47+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
48+
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
5749
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
5850
github.com/fatih/structs v1.1.0 // indirect
59-
github.com/go-errors/errors v1.0.1 // indirect
60-
github.com/go-logr/logr v1.2.3 // indirect
61-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
62-
github.com/go-openapi/jsonreference v0.19.5 // indirect
63-
github.com/go-openapi/swag v0.19.14 // indirect
51+
github.com/go-errors/errors v1.4.2 // indirect
52+
github.com/go-logr/logr v1.3.0 // indirect
53+
github.com/go-openapi/jsonpointer v0.20.0 // indirect
54+
github.com/go-openapi/jsonreference v0.20.2 // indirect
55+
github.com/go-openapi/swag v0.22.4 // indirect
6456
github.com/gogo/protobuf v1.3.2 // indirect
65-
github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
66-
github.com/golang/protobuf v1.5.2 // indirect
57+
github.com/golang/protobuf v1.5.3 // indirect
6758
github.com/google/btree v1.0.1 // indirect
68-
github.com/google/gnostic v0.5.7-v3refs // indirect
69-
github.com/google/go-cmp v0.5.9 // indirect
59+
github.com/google/gnostic-models v0.6.8 // indirect
60+
github.com/google/go-cmp v0.6.0 // indirect
7061
github.com/google/gofuzz v1.2.0 // indirect
7162
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
72-
github.com/google/uuid v1.3.0 // indirect
63+
github.com/google/uuid v1.4.0 // indirect
64+
github.com/gorilla/websocket v1.5.0 // indirect
7365
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
7466
github.com/imdario/mergo v0.3.13 // indirect
7567
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7668
github.com/josharian/intern v1.0.0 // indirect
7769
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
7870
github.com/mailru/easyjson v0.7.7 // indirect
79-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
80-
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
71+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
72+
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
8173
github.com/mitchellh/mapstructure v1.5.0 // indirect
8274
github.com/moby/spdystream v0.2.0 // indirect
83-
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
75+
github.com/moby/term v0.5.0 // indirect
8476
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8577
github.com/modern-go/reflect2 v1.0.2 // indirect
8678
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
8779
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
88-
github.com/onsi/gomega v1.20.1 // indirect
80+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
81+
github.com/nxadm/tail v1.4.11 // indirect
82+
github.com/onsi/gomega v1.30.0 // indirect
8983
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
90-
github.com/prometheus/client_golang v1.13.0 // indirect
91-
github.com/prometheus/client_model v0.2.0 // indirect
92-
github.com/prometheus/common v0.37.0 // indirect
93-
github.com/prometheus/procfs v0.8.0 // indirect
94-
github.com/russross/blackfriday v1.5.2 // indirect
84+
github.com/prometheus/client_golang v1.17.0 // indirect
85+
github.com/prometheus/client_model v0.5.0 // indirect
86+
github.com/prometheus/common v0.44.0 // indirect
87+
github.com/prometheus/procfs v0.11.1 // indirect
9588
github.com/russross/blackfriday/v2 v2.1.0 // indirect
9689
github.com/sergi/go-diff v1.2.0 // indirect
9790
github.com/spf13/pflag v1.0.5 // indirect
98-
github.com/xlab/treeprint v1.1.0 // indirect
91+
github.com/xlab/treeprint v1.2.0 // indirect
9992
github.com/yudai/gojsondiff v1.0.0 // indirect
10093
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
101-
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
102-
golang.org/x/crypto v0.13.0 // indirect
103-
golang.org/x/net v0.15.0 // indirect
104-
golang.org/x/oauth2 v0.5.0 // indirect
105-
golang.org/x/sys v0.12.0 // indirect
106-
golang.org/x/term v0.12.0 // indirect
107-
golang.org/x/time v0.1.0 // indirect
94+
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
95+
golang.org/x/net v0.19.0 // indirect
96+
golang.org/x/oauth2 v0.15.0 // indirect
97+
golang.org/x/sync v0.4.0 // indirect
98+
golang.org/x/sys v0.15.0 // indirect
99+
golang.org/x/term v0.15.0 // indirect
100+
golang.org/x/time v0.5.0 // indirect
108101
gomodules.xyz/clock v0.0.0-20200817085942-06523dba733f // indirect
109102
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
110103
gomodules.xyz/mergo v0.3.13 // indirect
111104
gomodules.xyz/sets v0.2.1 // indirect
112105
gomodules.xyz/wait v0.2.0 // indirect
113-
google.golang.org/appengine v1.6.7 // indirect
114-
google.golang.org/protobuf v1.28.1 // indirect
106+
google.golang.org/appengine v1.6.8 // indirect
107+
google.golang.org/protobuf v1.31.0 // indirect
115108
gopkg.in/inf.v0 v0.9.1 // indirect
116109
gopkg.in/yaml.v2 v2.4.0 // indirect
117110
gopkg.in/yaml.v3 v3.0.1 // indirect
118-
k8s.io/apiextensions-apiserver v0.25.1 // indirect
119-
k8s.io/apiserver v0.25.1 // indirect
120-
k8s.io/component-base v0.25.1 // indirect
121-
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
122-
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73 // indirect
123-
kmodules.xyz/custom-resources v0.25.2 // indirect
124-
kmodules.xyz/prober v0.25.0 // indirect
125-
kmodules.xyz/webhook-runtime v0.25.0 // indirect
126-
sigs.k8s.io/controller-runtime v0.13.1 // indirect
127-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
128-
sigs.k8s.io/kustomize/api v0.12.1 // indirect
129-
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
130-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
111+
k8s.io/apiextensions-apiserver v0.29.0 // indirect
112+
k8s.io/apiserver v0.29.0 // indirect
113+
k8s.io/component-base v0.29.0 // indirect
114+
k8s.io/kube-openapi v0.0.0-20231129212854-f0671cc7e66a // indirect
115+
k8s.io/utils v0.0.0-20231127182322-b307cd553661 // indirect
116+
kmodules.xyz/custom-resources v0.29.0 // indirect
117+
kmodules.xyz/prober v0.29.0 // indirect
118+
kmodules.xyz/webhook-runtime v0.29.0 // indirect
119+
sigs.k8s.io/controller-runtime v0.16.3 // indirect
120+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
121+
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
122+
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
123+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
131124
)
125+
126+
replace github.com/Masterminds/sprig/v3 => github.com/gomodules/sprig/v3 v3.2.3-0.20220405051441-0a8a99bac1b8
127+
128+
replace sigs.k8s.io/controller-runtime => github.com/kmodules/controller-runtime v0.16.1-0.20231224083233-bead154270db
129+
130+
replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.6
131+
132+
replace k8s.io/apiserver => github.com/kmodules/apiserver v0.29.1-0.20231224075222-50d5bb4aeb26
133+
134+
replace k8s.io/kubernetes => github.com/kmodules/kubernetes v1.30.0-alpha.0.0.20231224075822-3bd9a13c86db

0 commit comments

Comments
 (0)