Skip to content

Commit a8e5439

Browse files
committed
fix: update dependencies and resolve Ginkgo v2 compatibility
- Update controller-runtime to v0.14.6 for compatibility - Pin k8s.io packages to v0.26.3 - Add replace directives for konnectivity-client (v0.0.37) - Add OpenTelemetry version constraints for compatibility - Remove deprecated envtest/printer imports from all test files - Migrate from RunSpecsWithDefaultAndCustomReporters to RunSpecs This resolves dependency conflicts and ensures compatibility with Ginkgo v2 test framework. Signed-off-by: S Code Man <30977678+scodeman@users.noreply.github.com>
1 parent 36ff377 commit a8e5439

File tree

13 files changed

+125
-1945
lines changed

13 files changed

+125
-1945
lines changed

go.mod

Lines changed: 25 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,18 @@ toolchain go1.22.4
77
require (
88
github.com/Masterminds/semver/v3 v3.1.1
99
github.com/Masterminds/sprig/v3 v3.2.2
10-
github.com/fatih/color v1.13.0
1110
github.com/go-yaml/yaml v2.1.0+incompatible
12-
github.com/oam-dev/kubevela-core-api v1.7.7
13-
github.com/oam-dev/terraform-controller v0.7.0
14-
github.com/pkg/errors v0.9.1
1511
helm.sh/helm/v3 v3.7.2
16-
k8s.io/apimachinery v0.29.2
17-
k8s.io/client-go v0.29.2
18-
sigs.k8s.io/controller-runtime v0.17.6
1912
sigs.k8s.io/yaml v1.4.0
2013
)
2114

2215
require (
23-
cuelang.org/go v0.5.0-alpha.1 // indirect
2416
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
2517
github.com/Masterminds/goutils v1.1.1 // indirect
26-
github.com/NYTimes/gziphandler v1.1.1 // indirect
27-
github.com/PuerkitoBio/purell v1.1.1 // indirect
28-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
18+
github.com/Microsoft/go-winio v0.5.2 // indirect
2919
github.com/beorn7/perks v1.0.1 // indirect
30-
github.com/blang/semver/v4 v4.0.0 // indirect
3120
github.com/cespare/xxhash/v2 v2.2.0 // indirect
32-
github.com/cockroachdb/apd/v2 v2.0.2 // indirect
3321
github.com/containerd/containerd v1.5.13 // indirect
34-
github.com/coreos/go-semver v0.3.1 // indirect
35-
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
36-
github.com/crossplane/crossplane-runtime v0.14.1-0.20210722005935-0b469fcc77cd // indirect
3722
github.com/davecgh/go-spew v1.1.1 // indirect
3823
github.com/docker/cli v20.10.16+incompatible // indirect
3924
github.com/docker/distribution v2.8.1+incompatible // indirect
@@ -42,67 +27,48 @@ require (
4227
github.com/docker/go-connections v0.4.0 // indirect
4328
github.com/docker/go-metrics v0.0.1 // indirect
4429
github.com/docker/go-units v0.4.0 // indirect
30+
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
4531
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
4632
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
47-
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
48-
github.com/felixge/httpsnoop v1.0.3 // indirect
49-
github.com/fsnotify/fsnotify v1.7.0 // indirect
5033
github.com/go-errors/errors v1.4.2 // indirect
5134
github.com/go-logr/logr v1.4.2 // indirect
52-
github.com/go-logr/zapr v1.3.0 // indirect
5335
github.com/go-openapi/jsonpointer v0.19.6 // indirect
5436
github.com/go-openapi/jsonreference v0.20.2 // indirect
5537
github.com/go-openapi/swag v0.22.3 // indirect
56-
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
5738
github.com/gogo/protobuf v1.3.2 // indirect
58-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5939
github.com/golang/protobuf v1.5.3 // indirect
6040
github.com/google/btree v1.0.1 // indirect
6141
github.com/google/gnostic v0.5.7-v3refs // indirect
6242
github.com/google/gnostic-models v0.6.8 // indirect
6343
github.com/google/go-cmp v0.6.0 // indirect
6444
github.com/google/gofuzz v1.2.0 // indirect
65-
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
6645
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
6746
github.com/google/uuid v1.3.0 // indirect
68-
github.com/googleapis/gnostic v0.5.5 // indirect
6947
github.com/gorilla/mux v1.8.0 // indirect
7048
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
71-
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
72-
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
7349
github.com/huandu/xstrings v1.3.2 // indirect
7450
github.com/imdario/mergo v0.3.12 // indirect
7551
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7652
github.com/josharian/intern v1.0.0 // indirect
7753
github.com/json-iterator/go v1.1.12 // indirect
7854
github.com/klauspost/compress v1.15.12 // indirect
79-
github.com/kubevela/pkg v0.0.0-20230103022800-b6bdefd2e1de // indirect
80-
github.com/kubevela/workflow v0.3.5 // indirect
8155
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
8256
github.com/mailru/easyjson v0.7.7 // indirect
83-
github.com/mattn/go-colorable v0.1.13 // indirect
84-
github.com/mattn/go-isatty v0.0.16 // indirect
85-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
8657
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
8758
github.com/mitchellh/copystructure v1.2.0 // indirect
8859
github.com/mitchellh/reflectwalk v1.0.2 // indirect
8960
github.com/moby/locker v1.0.1 // indirect
61+
github.com/moby/sys/mountinfo v0.5.0 // indirect
9062
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
9163
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
9264
github.com/modern-go/reflect2 v1.0.2 // indirect
9365
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
9466
github.com/morikuni/aec v1.0.0 // indirect
95-
github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de // indirect
9667
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
97-
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
98-
github.com/nxadm/tail v1.4.8 // indirect
99-
github.com/oam-dev/cluster-gateway v1.7.0-alpha.1 // indirect
100-
github.com/onsi/ginkgo/v2 v2.22.2 // indirect
10168
github.com/opencontainers/go-digest v1.0.0 // indirect
10269
github.com/opencontainers/image-spec v1.0.3-0.20220114050600-8b9d41f48198 // indirect
103-
github.com/openshift/library-go v0.0.0-20221111030555-73ed40c0a938 // indirect
10470
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
105-
github.com/pmezard/go-difflib v1.0.0 // indirect
71+
github.com/pkg/errors v0.9.1 // indirect
10672
github.com/prometheus/client_golang v1.18.0 // indirect
10773
github.com/prometheus/client_model v0.5.0 // indirect
10874
github.com/prometheus/common v0.45.0 // indirect
@@ -114,62 +80,52 @@ require (
11480
github.com/spf13/pflag v1.0.5 // indirect
11581
github.com/stretchr/testify v1.8.4 // indirect
11682
github.com/xlab/treeprint v1.2.0 // indirect
117-
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
118-
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
119-
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
120-
go.opentelemetry.io/contrib v0.20.0 // indirect
121-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect
122-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
123-
go.opentelemetry.io/otel v1.19.0 // indirect
124-
go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect
125-
go.opentelemetry.io/otel/metric v1.19.0 // indirect
126-
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
127-
go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
128-
go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
129-
go.opentelemetry.io/otel/trace v1.19.0 // indirect
130-
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
13183
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
132-
go.uber.org/atomic v1.10.0 // indirect
133-
go.uber.org/multierr v1.11.0 // indirect
134-
go.uber.org/zap v1.26.0 // indirect
13584
golang.org/x/crypto v0.31.0 // indirect
136-
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
13785
golang.org/x/net v0.33.0 // indirect
13886
golang.org/x/oauth2 v0.12.0 // indirect
13987
golang.org/x/sync v0.10.0 // indirect
14088
golang.org/x/sys v0.28.0 // indirect
14189
golang.org/x/term v0.27.0 // indirect
14290
golang.org/x/text v0.21.0 // indirect
14391
golang.org/x/time v0.3.0 // indirect
144-
golang.org/x/tools v0.28.0 // indirect
145-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
14692
google.golang.org/appengine v1.6.7 // indirect
147-
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
14893
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
14994
google.golang.org/grpc v1.58.3 // indirect
15095
google.golang.org/protobuf v1.36.1 // indirect
15196
gopkg.in/inf.v0 v0.9.1 // indirect
152-
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
15397
gopkg.in/yaml.v2 v2.4.0 // indirect
15498
gopkg.in/yaml.v3 v3.0.1 // indirect
15599
k8s.io/api v0.29.2 // indirect
156-
k8s.io/apiextensions-apiserver v0.29.2 // indirect
157-
k8s.io/apiserver v0.29.2 // indirect
100+
k8s.io/apimachinery v0.26.3 // indirect
158101
k8s.io/cli-runtime v0.29.2 // indirect
159-
k8s.io/component-base v0.29.2 // indirect
160-
k8s.io/klog v1.0.0 // indirect
102+
k8s.io/client-go v0.26.3 // indirect
161103
k8s.io/klog/v2 v2.110.1 // indirect
162104
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
163105
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
164-
open-cluster-management.io/api v0.7.0 // indirect
165106
oras.land/oras-go v0.4.0 // indirect
166-
sigs.k8s.io/apiserver-network-proxy v0.0.30 // indirect
167-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
168-
sigs.k8s.io/apiserver-runtime v1.1.2-0.20221102045245-fb656940062f // indirect
169107
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
170108
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
171109
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
172110
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
173111
)
174112

175-
replace sigs.k8s.io/apiserver-network-proxy/konnectivity-client => sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.24
113+
replace (
114+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.0
115+
go.opentelemetry.io/otel => go.opentelemetry.io/otel v1.10.0
116+
go.opentelemetry.io/otel/exporters/otlp/otlptrace => go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0
117+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0
118+
go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v0.31.0
119+
go.opentelemetry.io/otel/sdk => go.opentelemetry.io/otel/sdk v1.10.0
120+
go.opentelemetry.io/otel/trace => go.opentelemetry.io/otel/trace v1.10.0
121+
k8s.io/api => k8s.io/api v0.26.3
122+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.3
123+
k8s.io/apimachinery => k8s.io/apimachinery v0.26.3
124+
k8s.io/apiserver => k8s.io/apiserver v0.26.3
125+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.3
126+
k8s.io/client-go => k8s.io/client-go v0.26.3
127+
k8s.io/component-base => k8s.io/component-base v0.26.3
128+
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20230202010329-39b3636cbaa3
129+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client => sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.37
130+
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.14.6
131+
)

0 commit comments

Comments
 (0)