Skip to content

Commit 837fe15

Browse files
authored
Use k8s 1.34 client libs (#73)
/cherry-pick Signed-off-by: Tamal Saha <tamal@appscode.com>
1 parent 65fee3e commit 837fe15

4,909 files changed

Lines changed: 782573 additions & 170419 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

4747
###
4848
### These variables should not need tweaking.

go.mod

Lines changed: 119 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,119 @@
11
module stash.appscode.dev/vault
22

3-
go 1.24.0
3+
go 1.25
44

55
require (
6-
cloud.google.com/go/kms v1.15.5
7-
cloud.google.com/go/storage v1.36.0
8-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0
6+
cloud.google.com/go/kms v1.21.0
7+
cloud.google.com/go/storage v1.51.0
8+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.0
99
github.com/Azure/azure-sdk-for-go/sdk/keyvault/azsecrets v0.12.0
10-
github.com/aws/aws-sdk-go v1.44.100
10+
github.com/aws/aws-sdk-go v1.55.6
1111
github.com/hashicorp/vault/api v1.10.0
12-
github.com/spf13/cobra v1.8.0
12+
github.com/spf13/cobra v1.10.1
1313
go.bytebuilders.dev/license-verifier/kubernetes v0.14.10
1414
gomodules.xyz/flags v0.1.3
1515
gomodules.xyz/go-sh v0.1.0
1616
gomodules.xyz/logs v0.0.7
1717
gomodules.xyz/password-generator v0.2.9
1818
gomodules.xyz/pointer v0.1.0
1919
gomodules.xyz/x v0.0.17
20-
google.golang.org/api v0.155.0
21-
google.golang.org/protobuf v1.34.2
22-
k8s.io/api v0.30.2
23-
k8s.io/apimachinery v0.30.2
24-
k8s.io/client-go v0.30.2
20+
google.golang.org/api v0.228.0
21+
google.golang.org/protobuf v1.36.10
22+
k8s.io/api v0.34.3
23+
k8s.io/apimachinery v0.34.3
24+
k8s.io/client-go v0.34.3
2525
k8s.io/klog/v2 v2.130.1
26-
kmodules.xyz/client-go v0.30.48
27-
kmodules.xyz/custom-resources v0.30.0
28-
kmodules.xyz/offshoot-api v0.30.1
26+
kmodules.xyz/client-go v0.34.2
27+
kmodules.xyz/custom-resources v0.34.0
28+
kmodules.xyz/offshoot-api v0.34.0
2929
kubevault.dev/apimachinery v0.18.3
30-
stash.appscode.dev/apimachinery v0.42.1-0.20251212070131-ba26c6b88bc6
30+
stash.appscode.dev/apimachinery v0.42.2-0.20251230090158-1034b727fe48
3131
)
3232

3333
require (
34-
cloud.google.com/go v0.112.0 // indirect
35-
cloud.google.com/go/compute/metadata v0.3.0 // indirect
36-
cloud.google.com/go/iam v1.1.5 // indirect
34+
cel.dev/expr v0.24.0 // indirect
35+
cloud.google.com/go/auth v0.15.0 // indirect
36+
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
37+
cloud.google.com/go/longrunning v0.6.5 // indirect
38+
cloud.google.com/go/monitoring v1.24.1 // indirect
39+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 // indirect
40+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0 // indirect
41+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 // indirect
42+
github.com/cncf/xds/go v0.0.0-20250326154945-ae57f3c0d45f // indirect
43+
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
44+
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
45+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
46+
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
47+
github.com/go-openapi/swag/cmdutils v0.25.1 // indirect
48+
github.com/go-openapi/swag/conv v0.25.1 // indirect
49+
github.com/go-openapi/swag/fileutils v0.25.1 // indirect
50+
github.com/go-openapi/swag/jsonname v0.25.1 // indirect
51+
github.com/go-openapi/swag/jsonutils v0.25.1 // indirect
52+
github.com/go-openapi/swag/loading v0.25.1 // indirect
53+
github.com/go-openapi/swag/mangling v0.25.1 // indirect
54+
github.com/go-openapi/swag/netutils v0.25.1 // indirect
55+
github.com/go-openapi/swag/stringutils v0.25.1 // indirect
56+
github.com/go-openapi/swag/typeutils v0.25.1 // indirect
57+
github.com/go-openapi/swag/yamlutils v0.25.1 // indirect
58+
github.com/google/btree v1.1.3 // indirect
59+
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
60+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
61+
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
62+
github.com/x448/float16 v0.8.4 // indirect
63+
github.com/zeebo/errs v1.4.0 // indirect
64+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
65+
go.opentelemetry.io/contrib/detectors/gcp v1.35.0 // indirect
66+
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
67+
go.opentelemetry.io/otel/sdk/metric v1.36.0 // indirect
68+
go.yaml.in/yaml/v2 v2.4.3 // indirect
69+
go.yaml.in/yaml/v3 v3.0.4 // indirect
70+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
71+
sigs.k8s.io/randfill v1.0.0 // indirect
72+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
73+
)
74+
75+
require (
76+
cloud.google.com/go v0.120.0 // indirect
77+
cloud.google.com/go/compute/metadata v0.7.0 // indirect
78+
cloud.google.com/go/iam v1.4.2 // indirect
3779
filippo.io/edwards25519 v1.1.0 // indirect
38-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1 // indirect
39-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0 // indirect
80+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.1 // indirect
81+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 // indirect
4082
github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.1 // indirect
41-
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
42-
github.com/Masterminds/semver/v3 v3.3.0 // indirect
83+
github.com/AzureAD/microsoft-authentication-library-for-go v1.5.0 // indirect
84+
github.com/Masterminds/semver/v3 v3.3.1 // indirect
4385
github.com/PuerkitoBio/purell v1.2.1 // indirect
4486
github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2 // indirect
4587
github.com/beorn7/perks v1.0.1 // indirect
4688
github.com/cenkalti/backoff/v3 v3.0.0 // indirect
4789
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4890
github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 // indirect
4991
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
50-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
51-
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
52-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
92+
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
93+
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
94+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
5395
github.com/fatih/structs v1.1.0 // indirect
5496
github.com/felixge/httpsnoop v1.0.4 // indirect
55-
github.com/fsnotify/fsnotify v1.7.0 // indirect
97+
github.com/fsnotify/fsnotify v1.9.0 // indirect
5698
github.com/ghodss/yaml v1.0.0 // indirect
5799
github.com/go-jose/go-jose/v3 v3.0.4 // indirect
58-
github.com/go-logr/logr v1.4.2 // indirect
100+
github.com/go-logr/logr v1.4.3 // indirect
59101
github.com/go-logr/stdr v1.2.2 // indirect
60-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
61-
github.com/go-openapi/jsonreference v0.21.0 // indirect
62-
github.com/go-openapi/swag v0.23.0 // indirect
63-
github.com/go-sql-driver/mysql v1.8.1 // indirect
102+
github.com/go-openapi/jsonpointer v0.22.1 // indirect
103+
github.com/go-openapi/jsonreference v0.21.2 // indirect
104+
github.com/go-openapi/swag v0.25.1 // indirect
105+
github.com/go-sql-driver/mysql v1.9.3 // indirect
64106
github.com/gogo/protobuf v1.3.2 // indirect
65-
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
66-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
67-
github.com/golang/protobuf v1.5.4 // indirect
68-
github.com/google/gnostic-models v0.6.8 // indirect
69-
github.com/google/go-cmp v0.6.0 // indirect
70-
github.com/google/go-containerregistry v0.19.1 // indirect
107+
github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
108+
github.com/google/gnostic-models v0.7.0 // indirect
109+
github.com/google/go-cmp v0.7.0 // indirect
110+
github.com/google/go-containerregistry v0.20.7 // indirect
71111
github.com/google/gofuzz v1.2.0 // indirect
72-
github.com/google/s2a-go v0.1.7 // indirect
112+
github.com/google/s2a-go v0.1.9 // indirect
73113
github.com/google/uuid v1.6.0 // indirect
74-
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
75-
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
76-
github.com/gorilla/websocket v1.5.1 // indirect
114+
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
115+
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
116+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
77117
github.com/hashicorp/errwrap v1.1.0 // indirect
78118
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
79119
github.com/hashicorp/go-multierror v1.1.1 // indirect
@@ -85,84 +125,79 @@ require (
85125
github.com/hashicorp/hcl v1.0.0 // indirect
86126
github.com/imdario/mergo v0.3.16 // indirect
87127
github.com/inconshreveable/mousetrap v1.1.0 // indirect
88-
github.com/jmespath/go-jmespath v0.4.0 // indirect
89-
github.com/josharian/intern v1.0.0 // indirect
128+
github.com/jmespath/go-jmespath v0.4.1-0.20220621161143-b0104c826a24 // indirect
90129
github.com/json-iterator/go v1.1.12 // indirect
91-
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
130+
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
92131
github.com/kylelemons/godebug v1.1.0 // indirect
93-
github.com/mailru/easyjson v0.7.7 // indirect
94132
github.com/mitchellh/go-homedir v1.1.0 // indirect
95133
github.com/mitchellh/mapstructure v1.5.0 // indirect
96134
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
97-
github.com/modern-go/reflect2 v1.0.2 // indirect
135+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
98136
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
99-
github.com/onsi/gomega v1.33.1 // indirect
137+
github.com/onsi/gomega v1.36.2 // indirect
100138
github.com/opencontainers/go-digest v1.0.0 // indirect
101139
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
102140
github.com/pkg/errors v0.9.1 // indirect
103-
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.75.2 // indirect
104-
github.com/prometheus/client_golang v1.18.0 // indirect
141+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.87.1 // indirect
142+
github.com/prometheus/client_golang v1.22.0 // indirect
105143
github.com/prometheus/client_model v0.6.1 // indirect
106-
github.com/prometheus/common v0.46.0 // indirect
107-
github.com/prometheus/procfs v0.15.0 // indirect
108-
github.com/rancher/norman v0.0.0-20240708202514-a0127673d1b9 // indirect
109-
github.com/rancher/rancher/pkg/client v0.0.0-20240710123941-93e332156bbe // indirect
110-
github.com/rancher/wrangler/v3 v3.0.0 // indirect
144+
github.com/prometheus/common v0.62.0 // indirect
145+
github.com/prometheus/procfs v0.15.1 // indirect
146+
github.com/rancher/norman v0.5.2 // indirect
147+
github.com/rancher/rancher/pkg/client v0.0.0-20250220153925-3abb578f42fe // indirect
148+
github.com/rancher/wrangler/v3 v3.2.0-rc.3 // indirect
111149
github.com/ryanuber/go-glob v1.0.0 // indirect
112-
github.com/sergi/go-diff v1.2.0 // indirect
150+
github.com/sergi/go-diff v1.3.1 // indirect
113151
github.com/sirupsen/logrus v1.9.3 // indirect
114-
github.com/spf13/pflag v1.0.5 // indirect
152+
github.com/spf13/pflag v1.0.9 // indirect
115153
github.com/yudai/gojsondiff v1.0.0 // indirect
116154
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
117155
github.com/zeebo/xxh3 v1.0.2 // indirect
118-
go.bytebuilders.dev/license-proxyserver v0.0.20 // indirect
156+
go.bytebuilders.dev/license-proxyserver v0.0.24 // indirect
119157
go.bytebuilders.dev/license-verifier v0.14.10 // indirect
120-
go.opencensus.io v0.24.0 // indirect
121-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
122-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
123-
go.opentelemetry.io/otel v1.24.0 // indirect
124-
go.opentelemetry.io/otel/metric v1.24.0 // indirect
125-
go.opentelemetry.io/otel/trace v1.24.0 // indirect
158+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
159+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
160+
go.opentelemetry.io/otel v1.36.0 // indirect
161+
go.opentelemetry.io/otel/metric v1.36.0 // indirect
162+
go.opentelemetry.io/otel/trace v1.36.0 // indirect
126163
golang.org/x/crypto v0.46.0 // indirect
127-
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
128164
golang.org/x/net v0.47.0 // indirect
129-
golang.org/x/oauth2 v0.27.0 // indirect
165+
golang.org/x/oauth2 v0.33.0 // indirect
130166
golang.org/x/sync v0.19.0 // indirect
131167
golang.org/x/sys v0.39.0 // indirect
132168
golang.org/x/term v0.38.0 // indirect
133169
golang.org/x/text v0.32.0 // indirect
134-
golang.org/x/time v0.5.0 // indirect
170+
golang.org/x/time v0.13.0 // indirect
135171
gomodules.xyz/clock v0.0.0-20200817085942-06523dba733f // indirect
136172
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
137173
gomodules.xyz/mergo v0.3.13 // indirect
138174
gomodules.xyz/sets v0.2.1 // indirect
139175
gomodules.xyz/wait v0.2.0 // indirect
140-
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect
141-
google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 // indirect
142-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
143-
google.golang.org/grpc v1.62.1 // indirect
176+
google.golang.org/genproto v0.0.0-20250324211829-b45e905df463 // indirect
177+
google.golang.org/genproto/googleapis/api v0.0.0-20250324211829-b45e905df463 // indirect
178+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect
179+
google.golang.org/grpc v1.72.1 // indirect
144180
gopkg.in/inf.v0 v0.9.1 // indirect
145181
gopkg.in/yaml.v2 v2.4.0 // indirect
146182
gopkg.in/yaml.v3 v3.0.1 // indirect
147-
k8s.io/apiextensions-apiserver v0.30.2 // indirect
148-
k8s.io/apiserver v0.30.2 // indirect
149-
k8s.io/kube-aggregator v0.30.2 // indirect
150-
k8s.io/kube-openapi v0.0.0-20240703190633-0aa61b46e8c2 // indirect
151-
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
183+
k8s.io/apiextensions-apiserver v0.34.3 // indirect
184+
k8s.io/apiserver v0.34.3 // indirect
185+
k8s.io/kube-aggregator v0.34.3 // indirect
186+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
187+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
152188
kmodules.xyz/apiversion v0.2.0 // indirect
153-
kmodules.xyz/monitoring-agent-api v0.29.0 // indirect
154-
kmodules.xyz/objectstore-api v0.29.1 // indirect
155-
kmodules.xyz/prober v0.29.0 // indirect
156-
sigs.k8s.io/controller-runtime v0.18.4 // indirect
157-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
158-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
159-
sigs.k8s.io/yaml v1.4.0 // indirect
189+
kmodules.xyz/monitoring-agent-api v0.34.0 // indirect
190+
kmodules.xyz/objectstore-api v0.34.0 // indirect
191+
kmodules.xyz/prober v0.34.0 // indirect
192+
sigs.k8s.io/controller-runtime v0.22.4 // indirect
193+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
194+
sigs.k8s.io/yaml v1.6.0 // indirect
160195
)
161196

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

164-
replace sigs.k8s.io/controller-runtime => github.com/kmodules/controller-runtime v0.18.4-0.20240603164526-fa88ec2314fe
199+
replace sigs.k8s.io/controller-runtime => github.com/kmodules/controller-runtime v0.22.5-0.20251227114913-f011264689cd
165200

166201
replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.6
167202

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

0 commit comments

Comments
 (0)