Skip to content

Commit acee58f

Browse files
authored
Merge pull request #16 from vishal210893/feature/k8s-0.31.10-upgrade
Bump Go version to 1.23.8 and upgrade Kubernetes dependencies to v0.31.10
2 parents 6964476 + dc7959d commit acee58f

File tree

6 files changed

+373
-717
lines changed

6 files changed

+373
-717
lines changed

.github/workflows/go.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
env:
1010
# Common versions
11-
GO_VERSION: "1.22"
11+
GO_VERSION: "1.23.8"
1212

1313
jobs:
1414
build:
@@ -19,7 +19,7 @@ jobs:
1919
- name: Set up Go
2020
uses: actions/setup-go@v5
2121
with:
22-
go-version: 1.22
22+
go-version: ${{ env.GO_VERSION }}
2323

2424
- name: Build
2525
run: go build -v ./...

go.mod

Lines changed: 103 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -1,135 +1,141 @@
11
module github.com/oam-dev/kubevela-core-api
22

3-
go 1.19
3+
go 1.23.8
44

55
require (
6-
cuelang.org/go v0.5.0
6+
cuelang.org/go v0.9.2
77
github.com/Masterminds/semver v1.5.0
8-
github.com/crossplane/crossplane-runtime v0.19.2
9-
github.com/davecgh/go-spew v1.1.1
10-
github.com/google/go-cmp v0.5.9
11-
github.com/kubevela/pkg v1.9.2
12-
github.com/kubevela/workflow v0.6.1
13-
github.com/oam-dev/cluster-gateway v1.9.0
8+
github.com/crossplane/crossplane-runtime v1.16.0
9+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
10+
github.com/google/go-cmp v0.7.0
11+
github.com/kubevela/pkg v1.9.3-0.20250625225831-a2894a62a307
12+
github.com/kubevela/workflow v0.6.3-0.20250717221743-56b80cee4121
13+
github.com/oam-dev/cluster-gateway v1.9.2-0.20250629203450-2b04dd452b7a
1414
github.com/oam-dev/terraform-controller v0.8.0
15-
github.com/onsi/ginkgo/v2 v2.9.5
16-
github.com/onsi/gomega v1.27.7
15+
github.com/onsi/ginkgo/v2 v2.23.3
16+
github.com/onsi/gomega v1.36.2
1717
github.com/pkg/errors v0.9.1
18-
github.com/stretchr/testify v1.8.3
19-
k8s.io/api v0.27.2
20-
k8s.io/apimachinery v0.27.2
21-
k8s.io/client-go v0.27.2
22-
k8s.io/utils v0.0.0-20241210054802-24370beab758
23-
sigs.k8s.io/controller-runtime v0.15.0
24-
sigs.k8s.io/controller-tools v0.11.4
25-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3
26-
sigs.k8s.io/yaml v1.3.0
18+
github.com/stretchr/testify v1.10.0
19+
k8s.io/api v0.31.10
20+
k8s.io/apimachinery v0.31.10
21+
k8s.io/client-go v0.31.10
22+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
23+
sigs.k8s.io/controller-runtime v0.19.7
24+
sigs.k8s.io/controller-tools v0.16.5
25+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0
26+
sigs.k8s.io/yaml v1.4.0
2727
)
2828

2929
require (
30+
dario.cat/mergo v1.0.0 // indirect
3031
github.com/NYTimes/gziphandler v1.1.1 // indirect
31-
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
32-
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
32+
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
33+
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
3334
github.com/beorn7/perks v1.0.1 // indirect
3435
github.com/blang/semver/v4 v4.0.0 // indirect
35-
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
36-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
37-
github.com/cockroachdb/apd/v2 v2.0.2 // indirect
38-
github.com/coreos/go-semver v0.3.0 // indirect
39-
github.com/coreos/go-systemd/v22 v22.4.0 // indirect
40-
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
41-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
42-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
43-
github.com/fatih/color v1.13.0 // indirect
44-
github.com/felixge/httpsnoop v1.0.3 // indirect
45-
github.com/fsnotify/fsnotify v1.6.0 // indirect
46-
github.com/go-logr/logr v1.2.4 // indirect
36+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
37+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
38+
github.com/cockroachdb/apd/v3 v3.2.1 // indirect
39+
github.com/coreos/go-semver v0.3.1 // indirect
40+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
41+
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
42+
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
43+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
44+
github.com/fatih/color v1.18.0 // indirect
45+
github.com/felixge/httpsnoop v1.0.4 // indirect
46+
github.com/fsnotify/fsnotify v1.7.0 // indirect
47+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
48+
github.com/go-logr/logr v1.4.2 // indirect
4749
github.com/go-logr/stdr v1.2.2 // indirect
48-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
49-
github.com/go-openapi/jsonreference v0.20.1 // indirect
50-
github.com/go-openapi/swag v0.22.3 // indirect
51-
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
52-
github.com/gobuffalo/flect v0.3.0 // indirect
50+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
51+
github.com/go-openapi/jsonreference v0.21.0 // indirect
52+
github.com/go-openapi/swag v0.23.0 // indirect
53+
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
54+
github.com/gobuffalo/flect v1.0.3 // indirect
5355
github.com/gogo/protobuf v1.3.2 // indirect
54-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
55-
github.com/golang/protobuf v1.5.3 // indirect
56-
github.com/google/cel-go v0.12.6 // indirect
57-
github.com/google/gnostic v0.5.7-v3refs // indirect
56+
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
57+
github.com/golang/protobuf v1.5.4 // indirect
58+
github.com/google/btree v1.1.2 // indirect
59+
github.com/google/cel-go v0.20.1 // indirect
60+
github.com/google/gnostic-models v0.6.9 // indirect
5861
github.com/google/gofuzz v1.2.0 // indirect
59-
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
60-
github.com/google/uuid v1.3.0 // indirect
62+
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
63+
github.com/google/uuid v1.6.0 // indirect
6164
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
62-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
63-
github.com/imdario/mergo v0.3.13 // indirect
64-
github.com/inconshreveable/mousetrap v1.0.1 // indirect
65+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
66+
github.com/imdario/mergo v0.3.16 // indirect
67+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6568
github.com/josharian/intern v1.0.0 // indirect
6669
github.com/json-iterator/go v1.1.12 // indirect
67-
github.com/klauspost/compress v1.16.3 // indirect
70+
github.com/klauspost/compress v1.17.10 // indirect
71+
github.com/kylelemons/godebug v1.1.0 // indirect
72+
github.com/lib/pq v1.10.9 // indirect
6873
github.com/mailru/easyjson v0.7.7 // indirect
6974
github.com/mattn/go-colorable v0.1.13 // indirect
70-
github.com/mattn/go-isatty v0.0.17 // indirect
71-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
72-
github.com/mitchellh/mapstructure v1.5.0 // indirect
75+
github.com/mattn/go-isatty v0.0.20 // indirect
7376
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7477
github.com/modern-go/reflect2 v1.0.2 // indirect
75-
github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de // indirect
7678
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7779
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
7880
github.com/openshift/library-go v0.0.0-20230327085348-8477ec72b725 // indirect
79-
github.com/pmezard/go-difflib v1.0.0 // indirect
80-
github.com/prometheus/client_golang v1.15.1 // indirect
81-
github.com/prometheus/client_model v0.4.0 // indirect
82-
github.com/prometheus/common v0.42.0 // indirect
83-
github.com/prometheus/procfs v0.9.0 // indirect
84-
github.com/spf13/cobra v1.6.1 // indirect
81+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
82+
github.com/prometheus/client_golang v1.20.5 // indirect
83+
github.com/prometheus/client_model v0.6.1 // indirect
84+
github.com/prometheus/common v0.55.0 // indirect
85+
github.com/prometheus/procfs v0.15.1 // indirect
86+
github.com/rogpeppe/go-internal v1.14.1 // indirect
87+
github.com/spf13/cobra v1.8.1 // indirect
8588
github.com/spf13/pflag v1.0.5 // indirect
8689
github.com/stoewer/go-strcase v1.2.0 // indirect
87-
go.etcd.io/etcd/api/v3 v3.5.7 // indirect
88-
go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
89-
go.etcd.io/etcd/client/v3 v3.5.7 // indirect
90-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
91-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 // indirect
92-
go.opentelemetry.io/otel v1.10.0 // indirect
93-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
94-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
95-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 // indirect
96-
go.opentelemetry.io/otel/metric v0.31.0 // indirect
97-
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
98-
go.opentelemetry.io/otel/trace v1.10.0 // indirect
99-
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
100-
go.uber.org/atomic v1.9.0 // indirect
90+
github.com/x448/float16 v0.8.4 // indirect
91+
go.etcd.io/etcd/api/v3 v3.5.16 // indirect
92+
go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect
93+
go.etcd.io/etcd/client/v3 v3.5.16 // indirect
94+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
95+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
96+
go.opentelemetry.io/otel v1.28.0 // indirect
97+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
98+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
99+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
100+
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
101+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
102+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
101103
go.uber.org/automaxprocs v1.5.3 // indirect
102-
go.uber.org/multierr v1.7.0 // indirect
103-
go.uber.org/zap v1.24.0 // indirect
104-
golang.org/x/crypto v0.12.0 // indirect
105-
golang.org/x/mod v0.10.0 // indirect
106-
golang.org/x/net v0.14.0 // indirect
107-
golang.org/x/oauth2 v0.6.0 // indirect
108-
golang.org/x/sync v0.2.0 // indirect
109-
golang.org/x/sys v0.12.0 // indirect
110-
golang.org/x/term v0.11.0 // indirect
111-
golang.org/x/text v0.12.0 // indirect
112-
golang.org/x/time v0.3.0 // indirect
113-
golang.org/x/tools v0.9.1 // indirect
114-
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
115-
google.golang.org/appengine v1.6.7 // indirect
116-
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
117-
google.golang.org/grpc v1.53.0 // indirect
118-
google.golang.org/protobuf v1.30.0 // indirect
104+
go.uber.org/multierr v1.11.0 // indirect
105+
go.uber.org/zap v1.26.0 // indirect
106+
golang.org/x/crypto v0.37.0 // indirect
107+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
108+
golang.org/x/mod v0.24.0 // indirect
109+
golang.org/x/net v0.39.0 // indirect
110+
golang.org/x/oauth2 v0.29.0 // indirect
111+
golang.org/x/sync v0.13.0 // indirect
112+
golang.org/x/sys v0.32.0 // indirect
113+
golang.org/x/term v0.31.0 // indirect
114+
golang.org/x/text v0.24.0 // indirect
115+
golang.org/x/time v0.10.0 // indirect
116+
golang.org/x/tools v0.31.0 // indirect
117+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
118+
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
119+
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
120+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
121+
google.golang.org/grpc v1.67.1 // indirect
122+
google.golang.org/protobuf v1.36.5 // indirect
123+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
119124
gopkg.in/inf.v0 v0.9.1 // indirect
120125
gopkg.in/yaml.v2 v2.4.0 // indirect
121126
gopkg.in/yaml.v3 v3.0.1 // indirect
122-
k8s.io/apiextensions-apiserver v0.27.2 // indirect
123-
k8s.io/apiserver v0.27.2 // indirect
124-
k8s.io/component-base v0.27.2 // indirect
127+
k8s.io/apiextensions-apiserver v0.31.10 // indirect
128+
k8s.io/apiserver v0.31.10 // indirect
129+
k8s.io/component-base v0.31.10 // indirect
125130
k8s.io/klog v1.0.0 // indirect
126-
k8s.io/klog/v2 v2.100.1 // indirect
127-
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
131+
k8s.io/klog/v2 v2.130.1 // indirect
132+
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a // indirect
128133
open-cluster-management.io/api v0.11.0 // indirect
129-
sigs.k8s.io/apiserver-network-proxy v0.0.30 // indirect
130-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
131-
sigs.k8s.io/apiserver-runtime v1.1.2-0.20221118041430-0a6394f6dda3 // indirect
134+
sigs.k8s.io/apiserver-network-proxy v0.31.4 // indirect
135+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.3 // indirect
136+
sigs.k8s.io/apiserver-runtime v1.1.2-0.20250117204231-9282f514a674 // indirect
132137
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
138+
sigs.k8s.io/randfill v1.0.0 // indirect
133139
)
134140

135141
replace sigs.k8s.io/apiserver-network-proxy/konnectivity-client => sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.36

0 commit comments

Comments
 (0)