Skip to content

Commit 390a8aa

Browse files
authored
Merge pull request #70 from leaseweb/k8s_1_31_5
chore(deps): Update K8s deps to v1.31.8
2 parents 08e0687 + d7937b3 commit 390a8aa

3 files changed

Lines changed: 215 additions & 237 deletions

File tree

cloudstack/cloudstack_instances_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"testing"
77

88
"github.com/apache/cloudstack-go/v2/cloudstack"
9-
"github.com/golang/mock/gomock"
109
"github.com/google/go-cmp/cmp"
1110
"github.com/stretchr/testify/assert"
11+
"go.uber.org/mock/gomock"
1212
corev1 "k8s.io/api/core/v1"
1313
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1414
cloudprovider "k8s.io/cloud-provider"

go.mod

Lines changed: 66 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,121 +1,120 @@
11
module github.com/apache/cloudstack-kubernetes-provider
22

3-
go 1.22.0
3+
go 1.23
44

5-
toolchain go1.22.8
5+
toolchain go1.23.5
66

77
require (
8-
github.com/apache/cloudstack-go/v2 v2.16.1
9-
github.com/golang/mock v1.6.0
8+
github.com/apache/cloudstack-go/v2 v2.17.0
109
github.com/google/go-cmp v0.6.0
11-
github.com/stretchr/testify v1.9.0
10+
github.com/stretchr/testify v1.10.0
11+
go.uber.org/mock v0.5.0
1212
gopkg.in/gcfg.v1 v1.2.3
13-
k8s.io/api v0.30.5
14-
k8s.io/apimachinery v0.30.5
15-
k8s.io/client-go v0.30.5
16-
k8s.io/cloud-provider v0.30.5
17-
k8s.io/component-base v0.30.5
18-
k8s.io/klog/v2 v2.120.1
19-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
13+
k8s.io/api v0.31.8
14+
k8s.io/apimachinery v0.31.8
15+
k8s.io/client-go v0.31.8
16+
k8s.io/cloud-provider v0.31.8
17+
k8s.io/component-base v0.31.8
18+
k8s.io/klog/v2 v2.130.1
19+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
2020
)
2121

2222
require (
2323
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
2424
github.com/NYTimes/gziphandler v1.1.1 // indirect
25-
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
25+
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
2626
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
2727
github.com/beorn7/perks v1.0.1 // indirect
2828
github.com/blang/semver/v4 v4.0.0 // indirect
29-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
30-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
29+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
30+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3131
github.com/coreos/go-semver v0.3.1 // indirect
3232
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
33-
github.com/davecgh/go-spew v1.1.1 // indirect
33+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3434
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
35-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
36-
github.com/felixge/httpsnoop v1.0.3 // indirect
35+
github.com/felixge/httpsnoop v1.0.4 // indirect
3736
github.com/fsnotify/fsnotify v1.7.0 // indirect
38-
github.com/go-logr/logr v1.4.1 // indirect
37+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
38+
github.com/go-logr/logr v1.4.2 // indirect
3939
github.com/go-logr/stdr v1.2.2 // indirect
4040
github.com/go-openapi/jsonpointer v0.19.6 // indirect
4141
github.com/go-openapi/jsonreference v0.20.2 // indirect
42-
github.com/go-openapi/swag v0.22.3 // indirect
42+
github.com/go-openapi/swag v0.22.4 // indirect
4343
github.com/gogo/protobuf v1.3.2 // indirect
4444
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4545
github.com/golang/protobuf v1.5.4 // indirect
46-
github.com/google/cel-go v0.17.8 // indirect
46+
github.com/google/cel-go v0.20.1 // indirect
4747
github.com/google/gnostic-models v0.6.8 // indirect
4848
github.com/google/gofuzz v1.2.0 // indirect
49-
github.com/google/uuid v1.3.0 // indirect
49+
github.com/google/uuid v1.6.0 // indirect
5050
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
51-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
51+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
5252
github.com/imdario/mergo v0.3.6 // indirect
5353
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5454
github.com/josharian/intern v1.0.0 // indirect
5555
github.com/json-iterator/go v1.1.12 // indirect
5656
github.com/mailru/easyjson v0.7.7 // indirect
57-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
58-
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
57+
github.com/moby/term v0.5.0 // indirect
5958
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6059
github.com/modern-go/reflect2 v1.0.2 // indirect
6160
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6261
github.com/pkg/errors v0.9.1 // indirect
63-
github.com/pmezard/go-difflib v1.0.0 // indirect
64-
github.com/prometheus/client_golang v1.16.0 // indirect
65-
github.com/prometheus/client_model v0.4.0 // indirect
66-
github.com/prometheus/common v0.44.0 // indirect
67-
github.com/prometheus/procfs v0.10.1 // indirect
68-
github.com/spf13/cobra v1.7.0 // indirect
62+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
63+
github.com/prometheus/client_golang v1.19.1 // indirect
64+
github.com/prometheus/client_model v0.6.1 // indirect
65+
github.com/prometheus/common v0.55.0 // indirect
66+
github.com/prometheus/procfs v0.15.1 // indirect
67+
github.com/spf13/cobra v1.8.1 // indirect
6968
github.com/spf13/pflag v1.0.5 // indirect
7069
github.com/stoewer/go-strcase v1.2.0 // indirect
71-
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
72-
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
73-
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
74-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect
75-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
76-
go.opentelemetry.io/otel v1.19.0 // indirect
77-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
78-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
79-
go.opentelemetry.io/otel/metric v1.19.0 // indirect
80-
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
81-
go.opentelemetry.io/otel/trace v1.19.0 // indirect
82-
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
70+
github.com/x448/float16 v0.8.4 // indirect
71+
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
72+
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
73+
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
74+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
75+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
76+
go.opentelemetry.io/otel v1.28.0 // indirect
77+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
78+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
79+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
80+
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
81+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
82+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
8383
go.uber.org/multierr v1.11.0 // indirect
8484
go.uber.org/zap v1.26.0 // indirect
85-
golang.org/x/crypto v0.21.0 // indirect
86-
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
87-
golang.org/x/net v0.23.0 // indirect
88-
golang.org/x/oauth2 v0.10.0 // indirect
89-
golang.org/x/sync v0.6.0 // indirect
90-
golang.org/x/sys v0.18.0 // indirect
91-
golang.org/x/term v0.18.0 // indirect
92-
golang.org/x/text v0.14.0 // indirect
85+
golang.org/x/crypto v0.24.0 // indirect
86+
golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
87+
golang.org/x/net v0.26.0 // indirect
88+
golang.org/x/oauth2 v0.21.0 // indirect
89+
golang.org/x/sync v0.7.0 // indirect
90+
golang.org/x/sys v0.21.0 // indirect
91+
golang.org/x/term v0.21.0 // indirect
92+
golang.org/x/text v0.16.0 // indirect
9393
golang.org/x/time v0.3.0 // indirect
94-
google.golang.org/appengine v1.6.7 // indirect
95-
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
96-
google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
97-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
98-
google.golang.org/grpc v1.58.3 // indirect
99-
google.golang.org/protobuf v1.33.0 // indirect
94+
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
95+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
96+
google.golang.org/grpc v1.65.0 // indirect
97+
google.golang.org/protobuf v1.34.2 // indirect
98+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
10099
gopkg.in/inf.v0 v0.9.1 // indirect
101100
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
102101
gopkg.in/warnings.v0 v0.1.1 // indirect
103102
gopkg.in/yaml.v2 v2.4.0 // indirect
104103
gopkg.in/yaml.v3 v3.0.1 // indirect
105-
k8s.io/apiserver v0.30.5 // indirect
106-
k8s.io/component-helpers v0.30.5 // indirect
107-
k8s.io/controller-manager v0.30.5 // indirect
108-
k8s.io/kms v0.30.5 // indirect
104+
k8s.io/apiserver v0.31.8 // indirect
105+
k8s.io/component-helpers v0.31.8 // indirect
106+
k8s.io/controller-manager v0.31.8 // indirect
107+
k8s.io/kms v0.31.8 // indirect
109108
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
110-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
109+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
111110
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
112111
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
113-
sigs.k8s.io/yaml v1.3.0 // indirect
112+
sigs.k8s.io/yaml v1.4.0 // indirect
114113
)
115114

116115
replace (
117-
k8s.io/apiserver => k8s.io/apiserver v0.30.5
118-
k8s.io/component-helpers => k8s.io/component-helpers v0.30.5
119-
k8s.io/controller-manager => k8s.io/controller-manager v0.30.5
120-
k8s.io/kms => k8s.io/kms v0.30.5
116+
k8s.io/apiserver => k8s.io/apiserver v0.31.8
117+
k8s.io/component-helpers => k8s.io/component-helpers v0.31.8
118+
k8s.io/controller-manager => k8s.io/controller-manager v0.31.8
119+
k8s.io/kms => k8s.io/kms v0.31.8
121120
)

0 commit comments

Comments
 (0)