Skip to content
This repository was archived by the owner on Mar 16, 2024. It is now read-only.

Commit 46a667b

Browse files
Merge pull request #2397 from ibuildthecloud/main
Update to k8s 1.29, remove all rancher code and go.mod replaces
2 parents 7a33960 + 820c0eb commit 46a667b

File tree

40 files changed

+1053
-608
lines changed

40 files changed

+1053
-608
lines changed

go.mod

+62-77
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,17 @@
11
module github.com/acorn-io/runtime
22

3-
go 1.21.0
4-
5-
replace (
6-
cuelang.org/go => cuelang.org/go v0.4.3
7-
github.com/docker/docker => github.com/docker/docker v20.10.3-0.20220121014307-40bb9831756f+incompatible
8-
github.com/rancher/wrangler => github.com/acorn-io/wrangler v0.0.0-20230619194218-746dc7cf6a0c
9-
k8s.io/client-go => k8s.io/client-go v0.27.3
10-
)
3+
go 1.21.5
114

125
require (
136
cuelang.org/go v0.6.0
147
github.com/AlecAivazis/survey/v2 v2.3.6
15-
github.com/acorn-io/aml v0.0.0-20231221034445-53c14e08c5ab
8+
github.com/acorn-io/aml v0.0.0-20240104225813-e936fb3bc7b6
169
github.com/acorn-io/aml/cli v0.0.0-20231113171943-4844e2f3e1a2
17-
github.com/acorn-io/aml/legacy v0.0.0-20230929081514-1e9f3394432e
18-
github.com/acorn-io/baaah v0.0.0-20231221034928-dfcf962a9d5b
19-
github.com/acorn-io/mink v0.0.0-20230804175412-8d121aae112c
10+
github.com/acorn-io/baaah v0.0.0-20240105013849-c4f82d7a5a41
11+
github.com/acorn-io/broadcaster v0.0.0-20240105011354-bfadd4a7b45d
12+
github.com/acorn-io/mink v0.0.0-20240105015834-b1f7af4fadea
2013
github.com/acorn-io/namegenerator v0.0.0-20220915160418-9e3d5a0ffe78
14+
github.com/acorn-io/schemer v0.0.0-20240105014212-9739d5485208
2115
github.com/acorn-io/z v0.0.0-20230714155009-a770ecbbdc45
2216
github.com/adrg/xdg v0.4.0
2317
github.com/aws/aws-sdk-go-v2 v1.20.0
@@ -33,7 +27,7 @@ require (
3327
github.com/go-acme/lego/v4 v4.9.1
3428
github.com/go-git/go-git/v5 v5.9.0
3529
github.com/golang/mock v1.6.0
36-
github.com/google/go-cmp v0.5.9
30+
github.com/google/go-cmp v0.6.0
3731
github.com/google/go-containerregistry v0.16.1
3832
github.com/google/go-containerregistry/pkg/authn/kubernetes v0.0.0-20221213180026-23d895d08035
3933
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
@@ -49,7 +43,6 @@ require (
4943
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
5044
github.com/pkg/errors v0.9.1
5145
github.com/pterm/pterm v0.12.49
52-
github.com/rancher/wrangler v1.0.2
5346
github.com/robfig/cron/v3 v3.0.1
5447
github.com/secure-systems-lab/go-securesystemslib v0.7.0
5548
github.com/sigstore/cosign/v2 v2.2.0
@@ -63,21 +56,21 @@ require (
6356
golang.org/x/crypto v0.14.0
6457
golang.org/x/exp v0.0.0-20231006140011-7918f672742d
6558
golang.org/x/sync v0.4.0
66-
google.golang.org/grpc v1.57.0
59+
google.golang.org/grpc v1.58.3
6760
inet.af/tcpproxy v0.0.0-20221017015627-91f861402626
68-
k8s.io/api v0.27.3
69-
k8s.io/apiextensions-apiserver v0.27.3
70-
k8s.io/apimachinery v0.27.3
71-
k8s.io/apiserver v0.27.3
72-
k8s.io/client-go v12.0.0+incompatible
61+
k8s.io/api v0.29.0
62+
k8s.io/apiextensions-apiserver v0.29.0
63+
k8s.io/apimachinery v0.29.0
64+
k8s.io/apiserver v0.29.0
65+
k8s.io/client-go v0.29.0
7366
k8s.io/klog v1.0.0
74-
k8s.io/klog/v2 v2.100.1
75-
k8s.io/kube-aggregator v0.27.3
76-
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f
77-
k8s.io/kubectl v0.27.3
78-
k8s.io/utils v0.0.0-20230505201702-9f6742963106
79-
sigs.k8s.io/controller-runtime v0.15.0-beta.0
80-
sigs.k8s.io/yaml v1.3.0
67+
k8s.io/klog/v2 v2.110.1
68+
k8s.io/kube-aggregator v0.29.0
69+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
70+
k8s.io/kubectl v0.29.0
71+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
72+
sigs.k8s.io/controller-runtime v0.16.3
73+
sigs.k8s.io/yaml v1.4.0
8174
)
8275

8376
require (
@@ -93,9 +86,8 @@ require (
9386
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
9487
github.com/acomagu/bufpipe v1.0.4 // indirect
9588
github.com/acorn-io/cmd v0.0.0-20230929053520-ebe1b9879b38 // indirect
96-
github.com/agnivade/levenshtein v1.1.1 // indirect
9789
github.com/alecthomas/chroma v0.10.0 // indirect
98-
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
90+
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
9991
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
10092
github.com/aws/aws-sdk-go-v2/credentials v1.13.31 // indirect
10193
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.7 // indirect
@@ -119,11 +111,10 @@ require (
119111
github.com/cespare/xxhash/v2 v2.2.0 // indirect
120112
github.com/chai2010/gettext-go v1.0.2 // indirect
121113
github.com/cloudflare/circl v1.3.3 // indirect
122-
github.com/cockroachdb/apd/v2 v2.0.2 // indirect
123114
github.com/containerd/continuity v0.4.1 // indirect
124115
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
125116
github.com/containerd/typeurl v1.0.3-0.20220422153119-7f6e6d160d67 // indirect
126-
github.com/coreos/go-semver v0.3.0 // indirect
117+
github.com/coreos/go-semver v0.3.1 // indirect
127118
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
128119
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
129120
github.com/cyberphone/json-canonicalization v0.0.0-20220623050100-57a0ce2678a7 // indirect
@@ -134,23 +125,21 @@ require (
134125
github.com/dlclark/regexp2 v1.4.0 // indirect
135126
github.com/docker/distribution v2.8.2+incompatible // indirect
136127
github.com/docker/docker v24.0.0+incompatible // indirect
137-
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
138-
github.com/emicklei/proto v1.10.0 // indirect
128+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
139129
github.com/emirpasic/gods v1.18.1 // indirect
140-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
141-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
130+
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
131+
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
142132
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
143133
github.com/fatih/color v1.15.0 // indirect
144134
github.com/felixge/httpsnoop v1.0.3 // indirect
145135
github.com/fsnotify/fsnotify v1.7.0 // indirect
146136
github.com/fujiwara/shapeio v1.0.0 // indirect
147137
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
148-
github.com/ghodss/yaml v1.0.0 // indirect
149138
github.com/go-chi/chi v4.1.2+incompatible // indirect
150139
github.com/go-errors/errors v1.4.2 // indirect
151140
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
152141
github.com/go-git/go-billy/v5 v5.5.0 // indirect
153-
github.com/go-logr/logr v1.2.4 // indirect
142+
github.com/go-logr/logr v1.4.1 // indirect
154143
github.com/go-logr/stdr v1.2.2 // indirect
155144
github.com/go-openapi/analysis v0.21.4 // indirect
156145
github.com/go-openapi/errors v0.20.4 // indirect
@@ -172,19 +161,18 @@ require (
172161
github.com/golang/protobuf v1.5.3 // indirect
173162
github.com/golang/snappy v0.0.4 // indirect
174163
github.com/google/btree v1.1.2 // indirect
175-
github.com/google/cel-go v0.12.6 // indirect
164+
github.com/google/cel-go v0.17.7 // indirect
176165
github.com/google/certificate-transparency-go v1.1.6 // indirect
177-
github.com/google/gnostic v0.6.9 // indirect
166+
github.com/google/gnostic-models v0.6.8 // indirect
178167
github.com/google/go-github/v53 v53.2.0 // indirect
179168
github.com/google/go-querystring v1.1.0 // indirect
180169
github.com/google/gofuzz v1.2.0 // indirect
181-
github.com/google/pprof v0.0.0-20221103000818-d260c55eee4c // indirect
182170
github.com/gookit/color v1.5.2 // indirect
183171
github.com/gorilla/css v1.0.0 // indirect
184172
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
185173
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
186174
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20210315223345-82c243799c99 // indirect
187-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2 // indirect
175+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
188176
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
189177
github.com/hashicorp/go-retryablehttp v0.7.4 // indirect
190178
github.com/hashicorp/hcl v1.0.0 // indirect
@@ -212,7 +200,7 @@ require (
212200
github.com/mattn/go-colorable v0.1.13 // indirect
213201
github.com/mattn/go-isatty v0.0.19 // indirect
214202
github.com/mattn/go-runewidth v0.0.14 // indirect
215-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
203+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
216204
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
217205
github.com/microcosm-cc/bluemonday v1.0.26 // indirect
218206
github.com/miekg/dns v1.1.50 // indirect
@@ -238,19 +226,16 @@ require (
238226
github.com/nozzle/throttler v0.0.0-20180817012639-2ea982251481 // indirect
239227
github.com/oklog/ulid v1.3.1 // indirect
240228
github.com/olekukonko/tablewriter v0.0.5 // indirect
241-
github.com/onsi/ginkgo/v2 v2.11.0 // indirect
242229
github.com/opentracing/opentracing-go v1.2.0 // indirect
243230
github.com/otiai10/copy v1.7.0 // indirect
244231
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
245232
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
246233
github.com/pjbgf/sha1cd v0.3.0 // indirect
247234
github.com/pmezard/go-difflib v1.0.0 // indirect
248-
github.com/prometheus/client_golang v1.16.0 // indirect
249-
github.com/prometheus/client_model v0.4.0 // indirect
250-
github.com/prometheus/common v0.44.0 // indirect
251-
github.com/prometheus/procfs v0.10.1 // indirect
252-
github.com/protocolbuffers/txtpbfmt v0.0.0-20230328191034-3462fbc510c0 // indirect
253-
github.com/rancher/lasso v0.0.0-20221227210133-6ea88ca2fbcc // indirect
235+
github.com/prometheus/client_golang v1.18.0 // indirect
236+
github.com/prometheus/client_model v0.5.0 // indirect
237+
github.com/prometheus/common v0.45.0 // indirect
238+
github.com/prometheus/procfs v0.12.0 // indirect
254239
github.com/rivo/uniseg v0.2.0 // indirect
255240
github.com/russross/blackfriday/v2 v2.1.0 // indirect
256241
github.com/sabhiram/go-gitignore v0.0.0-20180611051255-d3107576ba94 // indirect
@@ -279,57 +264,57 @@ require (
279264
github.com/vbatts/tar-split v0.11.3 // indirect
280265
github.com/xanzy/go-gitlab v0.90.0 // indirect
281266
github.com/xanzy/ssh-agent v0.3.3 // indirect
282-
github.com/xlab/treeprint v1.1.0 // indirect
267+
github.com/xlab/treeprint v1.2.0 // indirect
283268
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
284269
github.com/yuin/goldmark v1.5.2 // indirect
285270
github.com/yuin/goldmark-emoji v1.0.1 // indirect
286-
go.etcd.io/etcd/api/v3 v3.5.9 // indirect
287-
go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
288-
go.etcd.io/etcd/client/v3 v3.5.9 // indirect
271+
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
272+
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
273+
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
289274
go.mongodb.org/mongo-driver v1.11.3 // indirect
290-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
291-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.1-0.20230601092337-0332bf5c0078 // indirect
292-
go.opentelemetry.io/otel v1.16.0 // indirect
293-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect
294-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 // indirect
295-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.1-0.20230601143039-b9079960aed5 // indirect
296-
go.opentelemetry.io/otel/metric v1.16.0 // indirect
297-
go.opentelemetry.io/otel/sdk v1.16.0 // indirect
298-
go.opentelemetry.io/otel/trace v1.16.0 // indirect
299-
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
300-
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
275+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect
276+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
277+
go.opentelemetry.io/otel v1.19.0 // indirect
278+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
279+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
280+
go.opentelemetry.io/otel/metric v1.19.0 // indirect
281+
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
282+
go.opentelemetry.io/otel/trace v1.19.0 // indirect
283+
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
284+
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
301285
go.uber.org/multierr v1.11.0 // indirect
302-
go.uber.org/zap v1.25.0 // indirect
286+
go.uber.org/zap v1.26.0 // indirect
303287
golang.org/x/mod v0.13.0 // indirect
304288
golang.org/x/net v0.17.0 // indirect
305-
golang.org/x/oauth2 v0.11.0 // indirect
306-
golang.org/x/sys v0.13.0 // indirect
289+
golang.org/x/oauth2 v0.12.0 // indirect
290+
golang.org/x/sys v0.15.0 // indirect
307291
golang.org/x/term v0.13.0 // indirect
308292
golang.org/x/text v0.13.0 // indirect
309293
golang.org/x/time v0.3.0 // indirect
310294
golang.org/x/tools v0.14.0 // indirect
295+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
311296
google.golang.org/appengine v1.6.7 // indirect
312297
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
313298
google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 // indirect
314-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230807174057-1744710a1577 // indirect
299+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
315300
google.golang.org/protobuf v1.31.0 // indirect
316301
gopkg.in/inf.v0 v0.9.1 // indirect
317302
gopkg.in/ini.v1 v1.67.0 // indirect
318-
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
303+
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
319304
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
320305
gopkg.in/warnings.v0 v0.1.2 // indirect
321306
gopkg.in/yaml.v2 v2.4.0 // indirect
322307
gopkg.in/yaml.v3 v3.0.1 // indirect
323-
k8s.io/cli-runtime v0.27.3 // indirect
324-
k8s.io/component-base v0.27.3 // indirect
325-
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
326-
k8s.io/kms v0.27.3 // indirect
308+
k8s.io/cli-runtime v0.29.0 // indirect
309+
k8s.io/component-base v0.29.0 // indirect
310+
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
311+
k8s.io/kms v0.29.0 // indirect
327312
mvdan.cc/gofumpt v0.5.0 // indirect
328313
mvdan.cc/sh/v3 v3.5.1 // indirect
329-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
314+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
330315
sigs.k8s.io/controller-tools v0.12.0 // indirect
331316
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
332-
sigs.k8s.io/kustomize/api v0.13.2 // indirect
333-
sigs.k8s.io/kustomize/kyaml v0.14.1 // indirect
334-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
317+
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
318+
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
319+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
335320
)

0 commit comments

Comments
 (0)