Skip to content

Commit abb0081

Browse files
brandondbrandond
authored
Update to golang 1.23.3 / k8s 1.32 (#492)
* Bump gengo and k8s for v1.32 * Update CI to go1.23 * Replace go file generator format options with legacy imports config Signed-off-by: Brad Davidson <[email protected]>
1 parent f8cf1b5 commit abb0081

File tree

5 files changed

+154
-148
lines changed

5 files changed

+154
-148
lines changed

‎.github/workflows/ci.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- amd64
1818
- arm64
1919
runs-on: org-${{ github.repository_owner_id }}-${{ matrix.arch }}-k8s
20-
container: registry.suse.com/bci/golang:1.22
20+
container: registry.suse.com/bci/golang:1.23
2121
steps:
2222
- name : Checkout repository
2323
# https://github.com/actions/checkout/releases/tag/v4.1.1

‎.github/workflows/lint.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: golangci-lint
22

33
env:
4-
SETUP_GO_VERSION: '^1.22'
4+
SETUP_GO_VERSION: '^1.23'
55

66
on:
77
push:

‎go.mod

+37-39
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,56 @@
11
module github.com/rancher/wrangler/v3
22

3-
go 1.22.0
4-
5-
toolchain go1.22.6
3+
go 1.23.3
64

75
require (
86
github.com/evanphx/json-patch v5.9.0+incompatible
97
github.com/ghodss/yaml v1.0.0
108
github.com/moby/locker v1.0.1
119
github.com/pkg/errors v0.9.1
12-
github.com/rancher/lasso v0.0.0-20240924233157-8f384efc8813
10+
github.com/rancher/lasso v0.0.0-20241202185148-04649f379358
1311
github.com/sirupsen/logrus v1.9.3
1412
github.com/stretchr/testify v1.9.0
1513
go.uber.org/mock v0.4.0
16-
golang.org/x/sync v0.8.0
17-
golang.org/x/text v0.17.0
18-
golang.org/x/tools v0.24.0
19-
k8s.io/api v0.31.1
20-
k8s.io/apiextensions-apiserver v0.31.1
21-
k8s.io/apimachinery v0.31.1
22-
k8s.io/client-go v0.31.1
23-
k8s.io/code-generator v0.31.1
24-
k8s.io/gengo v0.0.0-20240826214909-a7b603a56eb7
25-
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70
26-
k8s.io/kube-aggregator v0.31.1
27-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
28-
sigs.k8s.io/cli-utils v0.37.2
14+
golang.org/x/sync v0.9.0
15+
golang.org/x/text v0.20.0
16+
golang.org/x/tools v0.27.0
17+
k8s.io/api v0.32.0
18+
k8s.io/apiextensions-apiserver v0.32.0
19+
k8s.io/apimachinery v0.32.0
20+
k8s.io/client-go v0.32.0
21+
k8s.io/code-generator v0.32.0
22+
k8s.io/gengo v0.0.0-20240911193312-2b36238f13e9
23+
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9
24+
k8s.io/kube-aggregator v0.32.0
25+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f
26+
sigs.k8s.io/cli-utils v0.36.0
2927
)
3028

3129
require (
30+
cel.dev/expr v0.18.0 // indirect
3231
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
3332
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
3433
github.com/beorn7/perks v1.0.1 // indirect
3534
github.com/blang/semver/v4 v4.0.0 // indirect
3635
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
3736
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3837
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
39-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
38+
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
4039
github.com/felixge/httpsnoop v1.0.4 // indirect
4140
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
4241
github.com/go-logr/logr v1.4.2 // indirect
4342
github.com/go-logr/stdr v1.2.2 // indirect
4443
github.com/go-openapi/jsonpointer v0.21.0 // indirect
45-
github.com/go-openapi/jsonreference v0.20.2 // indirect
44+
github.com/go-openapi/jsonreference v0.21.0 // indirect
4645
github.com/go-openapi/swag v0.23.0 // indirect
4746
github.com/gogo/protobuf v1.3.2 // indirect
4847
github.com/golang/protobuf v1.5.4 // indirect
49-
github.com/google/cel-go v0.20.1 // indirect
50-
github.com/google/gnostic-models v0.6.8 // indirect
48+
github.com/google/cel-go v0.22.0 // indirect
49+
github.com/google/gnostic-models v0.6.9 // indirect
5150
github.com/google/go-cmp v0.6.0 // indirect
5251
github.com/google/gofuzz v1.2.0 // indirect
5352
github.com/google/uuid v1.6.0 // indirect
5453
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
55-
github.com/imdario/mergo v0.3.13 // indirect
5654
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5755
github.com/josharian/intern v1.0.0 // indirect
5856
github.com/json-iterator/go v1.1.12 // indirect
@@ -67,7 +65,7 @@ require (
6765
github.com/prometheus/procfs v0.15.1 // indirect
6866
github.com/spf13/cobra v1.8.1 // indirect
6967
github.com/spf13/pflag v1.0.5 // indirect
70-
github.com/stoewer/go-strcase v1.2.0 // indirect
68+
github.com/stoewer/go-strcase v1.3.0 // indirect
7169
github.com/x448/float16 v0.8.4 // indirect
7270
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
7371
go.opentelemetry.io/otel v1.28.0 // indirect
@@ -77,28 +75,28 @@ require (
7775
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
7876
go.opentelemetry.io/otel/trace v1.28.0 // indirect
7977
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
80-
golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
81-
golang.org/x/mod v0.20.0 // indirect
82-
golang.org/x/net v0.28.0 // indirect
83-
golang.org/x/oauth2 v0.21.0 // indirect
84-
golang.org/x/sys v0.23.0 // indirect
85-
golang.org/x/term v0.23.0 // indirect
86-
golang.org/x/time v0.5.0 // indirect
87-
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
88-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
78+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
79+
golang.org/x/mod v0.22.0 // indirect
80+
golang.org/x/net v0.31.0 // indirect
81+
golang.org/x/oauth2 v0.23.0 // indirect
82+
golang.org/x/sys v0.27.0 // indirect
83+
golang.org/x/term v0.26.0 // indirect
84+
golang.org/x/time v0.7.0 // indirect
85+
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
86+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
8987
google.golang.org/grpc v1.65.0 // indirect
90-
google.golang.org/protobuf v1.34.2 // indirect
88+
google.golang.org/protobuf v1.35.2 // indirect
9189
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
9290
gopkg.in/inf.v0 v0.9.1 // indirect
9391
gopkg.in/yaml.v2 v2.4.0 // indirect
9492
gopkg.in/yaml.v3 v3.0.1 // indirect
95-
k8s.io/apiserver v0.31.1 // indirect
96-
k8s.io/component-base v0.31.1 // indirect
93+
k8s.io/apiserver v0.32.0 // indirect
94+
k8s.io/component-base v0.32.0 // indirect
9795
k8s.io/klog v1.0.0 // indirect
9896
k8s.io/klog/v2 v2.130.1 // indirect
99-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
100-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
101-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
102-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
97+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
98+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
99+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
100+
sigs.k8s.io/structured-merge-diff/v4 v4.4.3 // indirect
103101
sigs.k8s.io/yaml v1.4.0 // indirect
104102
)

0 commit comments

Comments
 (0)