Skip to content

Commit 8608eaa

Browse files
committed
Use k8s 1.34 & ocm/api v1.2.0
Signed-off-by: Tamal Saha <tamal@appscode.com>
1 parent 018e5ca commit 8608eaa

2 files changed

Lines changed: 322 additions & 281 deletions

File tree

go.mod

Lines changed: 91 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,143 +1,149 @@
11
module github.com/kluster-manager/cluster-gateway
22

3-
go 1.23.0
4-
5-
toolchain go1.24.2
3+
go 1.25.0
64

75
require (
86
github.com/ghodss/yaml v1.0.0
9-
github.com/kluster-manager/cluster-auth v0.4.0
10-
github.com/onsi/ginkgo/v2 v2.22.2
11-
github.com/onsi/gomega v1.36.2
12-
github.com/openshift/library-go v0.0.0-20240621150525-4bb4238aef81
7+
github.com/kluster-manager/cluster-auth v0.4.1
8+
github.com/onsi/ginkgo/v2 v2.27.5
9+
github.com/onsi/gomega v1.39.0
10+
github.com/openshift/library-go v0.0.0-20251120164824-14a789e09884
1311
github.com/pkg/errors v0.9.1
14-
github.com/spf13/cobra v1.8.1
15-
github.com/spf13/pflag v1.0.5
16-
github.com/stretchr/testify v1.9.0
17-
google.golang.org/grpc v1.67.1
18-
k8s.io/api v0.31.4
19-
k8s.io/apimachinery v0.31.4
20-
k8s.io/apiserver v0.31.4
21-
k8s.io/client-go v0.31.4
22-
k8s.io/component-base v0.31.4
12+
github.com/spf13/cobra v1.10.2
13+
github.com/spf13/pflag v1.0.10
14+
github.com/stretchr/testify v1.11.1
15+
google.golang.org/grpc v1.78.0
16+
k8s.io/api v0.34.3
17+
k8s.io/apimachinery v0.34.3
18+
k8s.io/apiserver v0.34.3
19+
k8s.io/client-go v0.34.3
20+
k8s.io/component-base v0.34.3
2321
k8s.io/klog/v2 v2.130.1
24-
k8s.io/kube-aggregator v0.31.4
25-
k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f
26-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
27-
kmodules.xyz/client-go v0.30.48
28-
open-cluster-management.io/addon-framework v0.12.0
29-
open-cluster-management.io/api v0.16.0
30-
open-cluster-management.io/managed-serviceaccount v0.8.0
31-
open-cluster-management.io/sdk-go v0.16.0
32-
sigs.k8s.io/apiserver-network-proxy v0.30.3
33-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3
34-
sigs.k8s.io/apiserver-runtime v1.1.2-0.20250117204231-9282f514a674
35-
sigs.k8s.io/controller-runtime v0.19.3
22+
k8s.io/kube-aggregator v0.34.3
23+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b
24+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
25+
kmodules.xyz/client-go v0.34.2
26+
open-cluster-management.io/addon-framework v1.2.0
27+
open-cluster-management.io/api v1.2.0
28+
open-cluster-management.io/managed-serviceaccount v0.9.0
29+
open-cluster-management.io/sdk-go v1.2.0
30+
sigs.k8s.io/apiserver-network-proxy v0.34.0
31+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2
32+
sigs.k8s.io/apiserver-runtime v1.1.1
33+
sigs.k8s.io/controller-runtime v0.22.4
3634
)
3735

3836
require (
37+
cel.dev/expr v0.24.0 // indirect
38+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
3939
github.com/NYTimes/gziphandler v1.1.1 // indirect
4040
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
41-
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
4241
github.com/beorn7/perks v1.0.1 // indirect
4342
github.com/blang/semver/v4 v4.0.0 // indirect
4443
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
4544
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4645
github.com/coreos/go-semver v0.3.1 // indirect
4746
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
4847
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
49-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
50-
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
51-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
48+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
49+
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
50+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
5251
github.com/fatih/structs v1.1.0 // indirect
5352
github.com/felixge/httpsnoop v1.0.4 // indirect
54-
github.com/fsnotify/fsnotify v1.7.0 // indirect
55-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
56-
github.com/go-logr/logr v1.4.2 // indirect
53+
github.com/fsnotify/fsnotify v1.9.0 // indirect
54+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
55+
github.com/go-logr/logr v1.4.3 // indirect
5756
github.com/go-logr/stdr v1.2.2 // indirect
58-
github.com/go-openapi/jsonpointer v0.20.0 // indirect
59-
github.com/go-openapi/jsonreference v0.20.2 // indirect
60-
github.com/go-openapi/swag v0.22.4 // indirect
57+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
58+
github.com/go-openapi/jsonreference v0.21.0 // indirect
59+
github.com/go-openapi/swag v0.23.1 // indirect
6160
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
6261
github.com/gogo/protobuf v1.3.2 // indirect
63-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6462
github.com/golang/protobuf v1.5.4 // indirect
65-
github.com/google/cel-go v0.20.1 // indirect
66-
github.com/google/gnostic-models v0.6.8 // indirect
67-
github.com/google/go-cmp v0.6.0 // indirect
68-
github.com/google/go-containerregistry v0.19.1 // indirect
63+
github.com/google/btree v1.1.3 // indirect
64+
github.com/google/cel-go v0.26.1 // indirect
65+
github.com/google/gnostic-models v0.7.0 // indirect
66+
github.com/google/go-cmp v0.7.0 // indirect
67+
github.com/google/go-containerregistry v0.20.6 // indirect
6968
github.com/google/gofuzz v1.2.0 // indirect
70-
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
69+
github.com/google/pprof v0.0.0-20250820193118-f64d9cf942d6 // indirect
7170
github.com/google/uuid v1.6.0 // indirect
7271
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
73-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
72+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
7473
github.com/imdario/mergo v0.3.16 // indirect
7574
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7675
github.com/josharian/intern v1.0.0 // indirect
7776
github.com/json-iterator/go v1.1.12 // indirect
7877
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
79-
github.com/mailru/easyjson v0.7.7 // indirect
78+
github.com/kylelemons/godebug v1.1.0 // indirect
79+
github.com/mailru/easyjson v0.9.0 // indirect
80+
github.com/mattn/go-isatty v0.0.17 // indirect
8081
github.com/mitchellh/mapstructure v1.5.0 // indirect
8182
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
82-
github.com/modern-go/reflect2 v1.0.2 // indirect
83+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
8384
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8485
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
8586
github.com/opencontainers/go-digest v1.0.0 // indirect
8687
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
87-
github.com/prometheus/client_golang v1.19.1 // indirect
88-
github.com/prometheus/client_model v0.6.1 // indirect
89-
github.com/prometheus/common v0.55.0 // indirect
90-
github.com/prometheus/procfs v0.15.1 // indirect
91-
github.com/sergi/go-diff v1.1.0 // indirect
92-
github.com/stoewer/go-strcase v1.2.0 // indirect
88+
github.com/prometheus/client_golang v1.23.2 // indirect
89+
github.com/prometheus/client_model v0.6.2 // indirect
90+
github.com/prometheus/common v0.66.1 // indirect
91+
github.com/prometheus/procfs v0.16.1 // indirect
92+
github.com/sergi/go-diff v1.2.0 // indirect
93+
github.com/stoewer/go-strcase v1.3.1 // indirect
9394
github.com/x448/float16 v0.8.4 // indirect
9495
github.com/yudai/gojsondiff v1.0.0 // indirect
9596
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
9697
github.com/zeebo/xxh3 v1.0.2 // indirect
97-
go.etcd.io/etcd/api/v3 v3.5.16 // indirect
98-
go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect
99-
go.etcd.io/etcd/client/v3 v3.5.16 // indirect
100-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
101-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
102-
go.opentelemetry.io/otel v1.28.0 // indirect
103-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
104-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
105-
go.opentelemetry.io/otel/metric v1.28.0 // indirect
106-
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
107-
go.opentelemetry.io/otel/trace v1.28.0 // indirect
108-
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
98+
go.etcd.io/etcd/api/v3 v3.6.4 // indirect
99+
go.etcd.io/etcd/client/pkg/v3 v3.6.4 // indirect
100+
go.etcd.io/etcd/client/v3 v3.6.4 // indirect
101+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
102+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
103+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
104+
go.opentelemetry.io/otel v1.38.0 // indirect
105+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
106+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
107+
go.opentelemetry.io/otel/metric v1.38.0 // indirect
108+
go.opentelemetry.io/otel/sdk v1.38.0 // indirect
109+
go.opentelemetry.io/otel/trace v1.38.0 // indirect
110+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
109111
go.uber.org/multierr v1.11.0 // indirect
110112
go.uber.org/zap v1.27.0 // indirect
111-
golang.org/x/crypto v0.36.0 // indirect
112-
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect
113-
golang.org/x/net v0.38.0 // indirect
114-
golang.org/x/oauth2 v0.27.0 // indirect
115-
golang.org/x/sync v0.12.0 // indirect
116-
golang.org/x/sys v0.31.0 // indirect
117-
golang.org/x/term v0.30.0 // indirect
118-
golang.org/x/text v0.23.0 // indirect
119-
golang.org/x/time v0.5.0 // indirect
120-
golang.org/x/tools v0.28.0 // indirect
113+
go.yaml.in/yaml/v2 v2.4.2 // indirect
114+
go.yaml.in/yaml/v3 v3.0.4 // indirect
115+
golang.org/x/crypto v0.46.0 // indirect
116+
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
117+
golang.org/x/mod v0.30.0 // indirect
118+
golang.org/x/net v0.47.0 // indirect
119+
golang.org/x/oauth2 v0.32.0 // indirect
120+
golang.org/x/sync v0.19.0 // indirect
121+
golang.org/x/sys v0.39.0 // indirect
122+
golang.org/x/term v0.38.0 // indirect
123+
golang.org/x/text v0.32.0 // indirect
124+
golang.org/x/time v0.14.0 // indirect
125+
golang.org/x/tools v0.39.0 // indirect
121126
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
122127
gomodules.xyz/mergo v0.3.13 // indirect
123128
gomodules.xyz/pointer v0.1.0 // indirect
124-
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
125-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
126-
google.golang.org/protobuf v1.36.1 // indirect
129+
google.golang.org/genproto/googleapis/api v0.0.0-20251029180050-ab9386a59fda // indirect
130+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda // indirect
131+
google.golang.org/protobuf v1.36.10 // indirect
127132
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
128133
gopkg.in/inf.v0 v0.9.1 // indirect
129134
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
130135
gopkg.in/yaml.v2 v2.4.0 // indirect
131136
gopkg.in/yaml.v3 v3.0.1 // indirect
132-
k8s.io/apiextensions-apiserver v0.31.0 // indirect
133-
k8s.io/kms v0.31.4 // indirect
134-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
135-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
136-
sigs.k8s.io/yaml v1.4.0 // indirect
137+
k8s.io/apiextensions-apiserver v0.34.3 // indirect
138+
k8s.io/kms v0.34.3 // indirect
139+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
140+
sigs.k8s.io/randfill v1.0.0 // indirect
141+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
142+
sigs.k8s.io/yaml v1.6.0 // indirect
137143
)
138144

139-
replace sigs.k8s.io/apiserver-runtime => github.com/kmodules/apiserver-runtime v1.1.2-0.20250422194347-c5ac4abaf2ae
145+
replace sigs.k8s.io/apiserver-runtime => github.com/kmodules/apiserver-runtime v1.1.2-0.20260207085433-63475f9e15a1
140146

141-
replace sigs.k8s.io/controller-runtime => github.com/kmodules/controller-runtime v0.19.8-0.20250421203610-c89dfee766ff
147+
replace sigs.k8s.io/controller-runtime => github.com/kmodules/controller-runtime v0.22.5-0.20251227114913-f011264689cd
142148

143149
replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.6

0 commit comments

Comments
 (0)