Skip to content

Commit 450b0fd

Browse files
committed
replace gomock with github.com/golang/mock and bump k8s.io to 1.29
Signed-off-by: Fan Shang Xiang <shafan@microsoft.com>
1 parent 29f4b94 commit 450b0fd

File tree

781 files changed

+39930
-28256
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

781 files changed

+39930
-28256
lines changed

go.mod

+50-51
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.21
44

55
require (
66
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible
7-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.0
7+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.1
88
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 v5.4.0
99
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v4 v4.3.0
1010
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.2.0
@@ -14,7 +14,6 @@ require (
1414
github.com/Azure/go-autorest/autorest v0.11.29
1515
github.com/Azure/go-autorest/autorest/to v0.4.0
1616
github.com/container-storage-interface/spec v1.8.0
17-
github.com/golang/mock v1.6.0
1817
github.com/golang/protobuf v1.5.3
1918
github.com/kubernetes-csi/csi-lib-utils v0.14.1
2019
github.com/kubernetes-csi/csi-proxy/client v1.0.1
@@ -25,33 +24,31 @@ require (
2524
github.com/pelletier/go-toml v1.9.4
2625
github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021
2726
github.com/stretchr/testify v1.8.4
27+
go.uber.org/mock v0.4.0
2828
golang.org/x/net v0.19.0
29-
golang.org/x/sys v0.15.0
29+
golang.org/x/sys v0.16.0
3030
google.golang.org/grpc v1.60.1
31-
google.golang.org/protobuf v1.32.0
32-
k8s.io/api v0.28.4
33-
k8s.io/apimachinery v0.28.4
34-
k8s.io/client-go v0.28.4
35-
k8s.io/cloud-provider v0.28.4
36-
k8s.io/component-base v0.28.4
31+
google.golang.org/protobuf v1.31.0
32+
k8s.io/api v0.29.0
33+
k8s.io/apimachinery v0.29.0
34+
k8s.io/client-go v0.29.0
35+
k8s.io/cloud-provider v0.29.0
36+
k8s.io/component-base v0.29.0
3737
k8s.io/klog/v2 v2.110.1
38-
k8s.io/kubernetes v1.28.4
38+
k8s.io/kubernetes v1.29.0
3939
k8s.io/mount-utils v0.29.0
4040
k8s.io/pod-security-admission v0.27.4
4141
k8s.io/utils v0.0.0-20231127182322-b307cd553661
42-
sigs.k8s.io/cloud-provider-azure v1.27.1-0.20231213062409-f1ce7de3fdcb
42+
sigs.k8s.io/cloud-provider-azure v1.27.1-0.20240108181414-3a9c6084f8a5
43+
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.0-20240108181414-3a9c6084f8a5
44+
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.0-20240108181414-3a9c6084f8a5
4345
sigs.k8s.io/yaml v1.4.0
4446
)
4547

46-
require (
47-
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.0-20231208091050-e3e6d2dc1575
48-
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.0-20231208091050-e3e6d2dc1575
49-
)
50-
5148
require (
5249
github.com/Azure/azure-pipeline-go v0.2.3 // indirect
5350
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0 // indirect
54-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.0 // indirect
51+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.1 // indirect
5552
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerregistry/armcontainerregistry v1.2.0 // indirect
5653
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v4 v4.6.0 // indirect
5754
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/keyvault/armkeyvault v1.4.0 // indirect
@@ -75,12 +72,12 @@ require (
7572
github.com/coreos/go-semver v0.3.1 // indirect
7673
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
7774
github.com/davecgh/go-spew v1.1.1 // indirect
78-
github.com/docker/distribution v2.8.2+incompatible // indirect
79-
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
75+
github.com/distribution/reference v0.5.0 // indirect
76+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
8077
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
8178
github.com/felixge/httpsnoop v1.0.4 // indirect
8279
github.com/fsnotify/fsnotify v1.7.0 // indirect
83-
github.com/go-logr/logr v1.3.0 // indirect
80+
github.com/go-logr/logr v1.4.1 // indirect
8481
github.com/go-logr/stdr v1.2.2 // indirect
8582
github.com/go-openapi/jsonpointer v0.19.6 // indirect
8683
github.com/go-openapi/jsonreference v0.20.2 // indirect
@@ -91,12 +88,13 @@ require (
9188
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
9289
github.com/golang-jwt/jwt/v5 v5.0.0 // indirect
9390
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
94-
github.com/google/cel-go v0.16.1 // indirect
91+
github.com/google/cel-go v0.17.7 // indirect
9592
github.com/google/gnostic-models v0.6.8 // indirect
9693
github.com/google/go-cmp v0.6.0 // indirect
9794
github.com/google/gofuzz v1.2.0 // indirect
9895
github.com/google/pprof v0.0.0-20230602010524-ada837c32108 // indirect
99-
github.com/google/uuid v1.4.0 // indirect
96+
github.com/google/uuid v1.5.0 // indirect
97+
github.com/gorilla/websocket v1.5.0 // indirect
10098
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
10199
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
102100
github.com/imdario/mergo v0.3.9 // indirect
@@ -112,8 +110,9 @@ require (
112110
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
113111
github.com/modern-go/reflect2 v1.0.2 // indirect
114112
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
113+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
115114
github.com/opencontainers/go-digest v1.0.0 // indirect
116-
github.com/opencontainers/selinux v1.10.0 // indirect
115+
github.com/opencontainers/selinux v1.11.0 // indirect
117116
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
118117
github.com/pkg/errors v0.9.1 // indirect
119118
github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -124,9 +123,9 @@ require (
124123
github.com/spf13/cobra v1.8.0 // indirect
125124
github.com/spf13/pflag v1.0.5 // indirect
126125
github.com/stoewer/go-strcase v1.2.0 // indirect
127-
go.etcd.io/etcd/api/v3 v3.5.9 // indirect
128-
go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
129-
go.etcd.io/etcd/client/v3 v3.5.9 // indirect
126+
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
127+
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
128+
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
130129
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
131130
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0 // indirect
132131
go.opentelemetry.io/otel v1.20.0 // indirect
@@ -139,12 +138,12 @@ require (
139138
go.uber.org/atomic v1.10.0 // indirect
140139
go.uber.org/multierr v1.11.0 // indirect
141140
go.uber.org/zap v1.19.0 // indirect
142-
golang.org/x/crypto v0.17.0 // indirect
141+
golang.org/x/crypto v0.18.0 // indirect
143142
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
144143
golang.org/x/mod v0.13.0 // indirect
145144
golang.org/x/oauth2 v0.13.0 // indirect
146-
golang.org/x/sync v0.5.0 // indirect
147-
golang.org/x/term v0.15.0 // indirect
145+
golang.org/x/sync v0.6.0 // indirect
146+
golang.org/x/term v0.16.0 // indirect
148147
golang.org/x/text v0.14.0 // indirect
149148
golang.org/x/time v0.5.0 // indirect
150149
golang.org/x/tools v0.14.0 // indirect
@@ -157,31 +156,31 @@ require (
157156
gopkg.in/yaml.v2 v2.4.0 // indirect
158157
gopkg.in/yaml.v3 v3.0.1 // indirect
159158
k8s.io/apiextensions-apiserver v0.0.0 // indirect
160-
k8s.io/apiserver v0.28.4 // indirect
161-
k8s.io/component-helpers v0.28.4 // indirect
162-
k8s.io/controller-manager v0.28.4 // indirect
163-
k8s.io/kms v0.28.4 // indirect
164-
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
159+
k8s.io/apiserver v0.29.0 // indirect
160+
k8s.io/component-helpers v0.29.0 // indirect
161+
k8s.io/controller-manager v0.29.0 // indirect
162+
k8s.io/kms v0.29.0 // indirect
163+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
165164
k8s.io/kubectl v0.0.0 // indirect
166-
k8s.io/kubelet v0.28.4 // indirect
167-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
165+
k8s.io/kubelet v0.29.0 // indirect
166+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
168167
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
169-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
168+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
170169
)
171170

172171
replace (
173-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.1
174-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.1
175-
k8s.io/cri-api => k8s.io/cri-api v0.28.1
176-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.1
177-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.28.1
178-
k8s.io/endpointslice => k8s.io/endpointslice v0.28.1
179-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.1
180-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.1
181-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.1
182-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.1
183-
k8s.io/kubectl => k8s.io/kubectl v0.28.1
184-
k8s.io/kubelet => k8s.io/kubelet v0.28.1
185-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.1
186-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.1
172+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.0
173+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.0
174+
k8s.io/cri-api => k8s.io/cri-api v0.29.0
175+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.0
176+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.0
177+
k8s.io/endpointslice => k8s.io/endpointslice v0.29.0
178+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.0
179+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.0
180+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.0
181+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.0
182+
k8s.io/kubectl => k8s.io/kubectl v0.29.0
183+
k8s.io/kubelet => k8s.io/kubelet v0.29.0
184+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.0
185+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.0
187186
)

0 commit comments

Comments
 (0)