Skip to content

Commit 3f9efb9

Browse files
1gtmtamalsaha
1gtm
and
tamalsaha
authored
[cherry-pick] Use k8s 1.34 client libs (#199) (#201)
/cherry-pick Signed-off-by: Tamal Saha <tamal@appscode.com> Co-authored-by: Tamal Saha <tamal@appscode.com>
1 parent ff51729 commit 3f9efb9

3,302 files changed

Lines changed: 255913 additions & 113022 deletions

File tree

Some content is hidden

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

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ else
4242
endif
4343
endif
4444

45-
RESTIC_VER := 0.17.3
45+
RESTIC_VER := 0.18.1
4646
NATS_CLI_VER := 0.0.32
4747
###
4848
### These variables should not need tweaking.

‎go.mod‎

Lines changed: 76 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -3,115 +3,132 @@ module stash.appscode.dev/nats
33
go 1.25.5
44

55
require (
6-
github.com/spf13/cobra v1.8.0
6+
github.com/spf13/cobra v1.10.1
77
go.bytebuilders.dev/license-verifier/kubernetes v0.14.10
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.17
12-
k8s.io/apimachinery v0.30.2
13-
k8s.io/client-go v0.30.2
12+
k8s.io/apimachinery v0.34.3
13+
k8s.io/client-go v0.34.3
1414
k8s.io/klog/v2 v2.130.1
15-
kmodules.xyz/client-go v0.30.48
16-
kmodules.xyz/custom-resources v0.30.0
17-
kmodules.xyz/offshoot-api v0.30.1
18-
stash.appscode.dev/apimachinery v0.42.1-0.20251212070131-ba26c6b88bc6
15+
kmodules.xyz/client-go v0.34.2
16+
kmodules.xyz/custom-resources v0.34.0
17+
kmodules.xyz/offshoot-api v0.34.0
18+
stash.appscode.dev/apimachinery v0.42.2-0.20251230090158-1034b727fe48
19+
)
20+
21+
require (
22+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
23+
github.com/go-openapi/swag/cmdutils v0.25.1 // indirect
24+
github.com/go-openapi/swag/conv v0.25.1 // indirect
25+
github.com/go-openapi/swag/fileutils v0.25.1 // indirect
26+
github.com/go-openapi/swag/jsonname v0.25.1 // indirect
27+
github.com/go-openapi/swag/jsonutils v0.25.1 // indirect
28+
github.com/go-openapi/swag/loading v0.25.1 // indirect
29+
github.com/go-openapi/swag/mangling v0.25.1 // indirect
30+
github.com/go-openapi/swag/netutils v0.25.1 // indirect
31+
github.com/go-openapi/swag/stringutils v0.25.1 // indirect
32+
github.com/go-openapi/swag/typeutils v0.25.1 // indirect
33+
github.com/go-openapi/swag/yamlutils v0.25.1 // indirect
34+
github.com/google/btree v1.1.3 // indirect
35+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
36+
github.com/x448/float16 v0.8.4 // indirect
37+
go.yaml.in/yaml/v2 v2.4.3 // indirect
38+
go.yaml.in/yaml/v3 v3.0.4 // indirect
39+
golang.org/x/sync v0.19.0 // indirect
40+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
41+
sigs.k8s.io/randfill v1.0.0 // indirect
42+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
1943
)
2044

2145
require (
2246
filippo.io/edwards25519 v1.1.0 // indirect
23-
github.com/Masterminds/semver/v3 v3.3.0 // indirect
47+
github.com/Masterminds/semver/v3 v3.3.1 // indirect
2448
github.com/PuerkitoBio/purell v1.2.1 // indirect
2549
github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2 // indirect
2650
github.com/beorn7/perks v1.0.1 // indirect
2751
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2852
github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 // indirect
2953
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
30-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
31-
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
32-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
54+
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
55+
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
56+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
3357
github.com/fatih/structs v1.1.0 // indirect
34-
github.com/fsnotify/fsnotify v1.7.0 // indirect
58+
github.com/fsnotify/fsnotify v1.9.0 // indirect
3559
github.com/ghodss/yaml v1.0.0 // indirect
36-
github.com/go-logr/logr v1.4.2 // indirect
37-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
38-
github.com/go-openapi/jsonreference v0.21.0 // indirect
39-
github.com/go-openapi/swag v0.23.0 // indirect
40-
github.com/go-sql-driver/mysql v1.8.1 // indirect
60+
github.com/go-logr/logr v1.4.3 // indirect
61+
github.com/go-openapi/jsonpointer v0.22.1 // indirect
62+
github.com/go-openapi/jsonreference v0.21.2 // indirect
63+
github.com/go-openapi/swag v0.25.1 // indirect
64+
github.com/go-sql-driver/mysql v1.9.3 // indirect
4165
github.com/gogo/protobuf v1.3.2 // indirect
42-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
43-
github.com/golang/protobuf v1.5.4 // indirect
44-
github.com/google/gnostic-models v0.6.8 // indirect
45-
github.com/google/go-cmp v0.6.0 // indirect
46-
github.com/google/go-containerregistry v0.19.1 // indirect
66+
github.com/google/gnostic-models v0.7.0 // indirect
67+
github.com/google/go-cmp v0.7.0 // indirect
68+
github.com/google/go-containerregistry v0.20.7 // indirect
4769
github.com/google/gofuzz v1.2.0 // indirect
4870
github.com/google/uuid v1.6.0 // indirect
49-
github.com/gorilla/websocket v1.5.1 // indirect
71+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
5072
github.com/imdario/mergo v0.3.16 // indirect
5173
github.com/inconshreveable/mousetrap v1.1.0 // indirect
52-
github.com/josharian/intern v1.0.0 // indirect
5374
github.com/json-iterator/go v1.1.12 // indirect
54-
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
55-
github.com/mailru/easyjson v0.7.7 // indirect
75+
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
5676
github.com/mitchellh/mapstructure v1.5.0 // indirect
5777
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
58-
github.com/modern-go/reflect2 v1.0.2 // indirect
78+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
5979
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
60-
github.com/onsi/gomega v1.33.1 // indirect
80+
github.com/onsi/gomega v1.36.2 // indirect
6181
github.com/opencontainers/go-digest v1.0.0 // indirect
6282
github.com/pkg/errors v0.9.1 // indirect
63-
github.com/prometheus/client_golang v1.18.0 // indirect
83+
github.com/prometheus/client_golang v1.22.0 // indirect
6484
github.com/prometheus/client_model v0.6.1 // indirect
65-
github.com/prometheus/common v0.46.0 // indirect
66-
github.com/prometheus/procfs v0.15.0 // indirect
67-
github.com/rancher/norman v0.0.0-20240708202514-a0127673d1b9 // indirect
68-
github.com/rancher/rancher/pkg/client v0.0.0-20240710123941-93e332156bbe // indirect
69-
github.com/rancher/wrangler/v3 v3.0.0 // indirect
70-
github.com/rogpeppe/go-internal v1.12.0 // indirect
71-
github.com/sergi/go-diff v1.2.0 // indirect
85+
github.com/prometheus/common v0.62.0 // indirect
86+
github.com/prometheus/procfs v0.15.1 // indirect
87+
github.com/rancher/norman v0.5.2 // indirect
88+
github.com/rancher/rancher/pkg/client v0.0.0-20250220153925-3abb578f42fe // indirect
89+
github.com/rancher/wrangler/v3 v3.2.0-rc.3 // indirect
90+
github.com/sergi/go-diff v1.3.1 // indirect
7291
github.com/sirupsen/logrus v1.9.3 // indirect
73-
github.com/spf13/pflag v1.0.5 // indirect
92+
github.com/spf13/pflag v1.0.9 // indirect
7493
github.com/yudai/gojsondiff v1.0.0 // indirect
7594
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
7695
github.com/zeebo/xxh3 v1.0.2 // indirect
77-
go.bytebuilders.dev/license-proxyserver v0.0.20 // indirect
96+
go.bytebuilders.dev/license-proxyserver v0.0.24 // indirect
7897
go.bytebuilders.dev/license-verifier v0.14.10 // indirect
79-
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
8098
golang.org/x/net v0.47.0 // indirect
81-
golang.org/x/oauth2 v0.27.0 // indirect
82-
golang.org/x/sys v0.38.0 // indirect
83-
golang.org/x/term v0.37.0 // indirect
84-
golang.org/x/text v0.31.0 // indirect
85-
golang.org/x/time v0.5.0 // indirect
99+
golang.org/x/oauth2 v0.33.0 // indirect
100+
golang.org/x/sys v0.39.0 // indirect
101+
golang.org/x/term v0.38.0 // indirect
102+
golang.org/x/text v0.32.0 // indirect
103+
golang.org/x/time v0.13.0 // indirect
86104
gomodules.xyz/clock v0.0.0-20200817085942-06523dba733f // indirect
87105
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
88106
gomodules.xyz/mergo v0.3.13 // indirect
89107
gomodules.xyz/pointer v0.1.0 // indirect
90108
gomodules.xyz/sets v0.2.1 // indirect
91109
gomodules.xyz/wait v0.2.0 // indirect
92-
google.golang.org/protobuf v1.34.2 // indirect
110+
google.golang.org/protobuf v1.36.10 // indirect
93111
gopkg.in/inf.v0 v0.9.1 // indirect
94112
gopkg.in/yaml.v2 v2.4.0 // indirect
95113
gopkg.in/yaml.v3 v3.0.1 // indirect
96-
k8s.io/api v0.30.2 // indirect
97-
k8s.io/apiextensions-apiserver v0.30.2 // indirect
98-
k8s.io/apiserver v0.30.2 // indirect
99-
k8s.io/kube-aggregator v0.30.2 // indirect
100-
k8s.io/kube-openapi v0.0.0-20240703190633-0aa61b46e8c2 // indirect
101-
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
114+
k8s.io/api v0.34.3 // indirect
115+
k8s.io/apiextensions-apiserver v0.34.3 // indirect
116+
k8s.io/apiserver v0.34.3 // indirect
117+
k8s.io/kube-aggregator v0.34.3 // indirect
118+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
119+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
102120
kmodules.xyz/apiversion v0.2.0 // indirect
103-
kmodules.xyz/objectstore-api v0.29.1 // indirect
104-
kmodules.xyz/prober v0.29.0 // indirect
105-
sigs.k8s.io/controller-runtime v0.18.4 // indirect
106-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
107-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
108-
sigs.k8s.io/yaml v1.4.0 // indirect
121+
kmodules.xyz/objectstore-api v0.34.0 // indirect
122+
kmodules.xyz/prober v0.34.0 // indirect
123+
sigs.k8s.io/controller-runtime v0.22.4 // indirect
124+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
125+
sigs.k8s.io/yaml v1.6.0 // indirect
109126
)
110127

111128
replace github.com/Masterminds/sprig/v3 => github.com/gomodules/sprig/v3 v3.2.3-0.20220405051441-0a8a99bac1b8
112129

113-
replace sigs.k8s.io/controller-runtime => github.com/kmodules/controller-runtime v0.18.4-0.20240603164526-fa88ec2314fe
130+
replace sigs.k8s.io/controller-runtime => github.com/kmodules/controller-runtime v0.22.5-0.20251227114913-f011264689cd
114131

115132
replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.6
116133

117-
replace k8s.io/apiserver => github.com/kmodules/apiserver v0.30.3-0.20240717062442-8d4dcc0bdd0b
134+
replace k8s.io/apiserver => github.com/kmodules/apiserver v0.34.4-0.20251227112449-07fa35efc6fc

0 commit comments

Comments
 (0)