Skip to content

Commit 14e41db

Browse files
authored
Merge pull request #1213 from MartinForReal/shafan/bumpk8s
Chores:replace gomock with go.uber.org/mock and bump k8s.io to 1.29
2 parents bfd8358 + 7f02674 commit 14e41db

File tree

784 files changed

+41560
-26086
lines changed

Some content is hidden

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

784 files changed

+41560
-26086
lines changed

go.mod

Lines changed: 66 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -12,34 +12,34 @@ require (
1212
github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
1313
github.com/container-storage-interface/spec v1.8.0
1414
github.com/gofrs/uuid v4.4.0+incompatible // indirect
15-
github.com/golang/mock v1.6.0
1615
github.com/golang/protobuf v1.5.3
1716
github.com/imdario/mergo v0.3.9 // indirect
1817
github.com/kubernetes-csi/csi-lib-utils v0.16.0
1918
github.com/onsi/gomega v1.30.0
2019
github.com/pborman/uuid v1.2.1
2120
github.com/pelletier/go-toml v1.9.5
2221
github.com/stretchr/testify v1.8.4
22+
go.uber.org/mock v0.4.0
2323
golang.org/x/net v0.19.0
2424
google.golang.org/grpc v1.59.0
2525
google.golang.org/protobuf v1.32.0
26-
k8s.io/api v0.28.4
27-
k8s.io/apimachinery v0.28.4
28-
k8s.io/client-go v0.28.4
29-
k8s.io/component-base v0.28.4
26+
k8s.io/api v0.29.0
27+
k8s.io/apimachinery v0.29.0
28+
k8s.io/client-go v0.29.0
29+
k8s.io/component-base v0.29.0
3030
k8s.io/klog/v2 v2.110.1
31-
k8s.io/kubernetes v1.28.5
32-
k8s.io/mount-utils v0.28.4
31+
k8s.io/kubernetes v1.29.0
32+
k8s.io/mount-utils v0.29.0
3333
k8s.io/utils v0.0.0-20231127182322-b307cd553661
34-
sigs.k8s.io/cloud-provider-azure v1.27.1-0.20231213062409-f1ce7de3fdcb
34+
sigs.k8s.io/cloud-provider-azure v1.27.1-0.20240108181414-3a9c6084f8a5
3535
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.0-20231208022044-b9ede3fc98e9
3636
sigs.k8s.io/yaml v1.4.0
3737
)
3838

3939
require (
40-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.0
41-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.0 // indirect
42-
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 v5.3.0 // indirect
40+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.1
41+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.1 // indirect
42+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 v5.4.0 // indirect
4343
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerregistry/armcontainerregistry v1.2.0 // indirect
4444
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v4 v4.6.0 // indirect
4545
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/keyvault/armkeyvault v1.4.0
@@ -65,13 +65,12 @@ require (
6565
github.com/coreos/go-semver v0.3.1 // indirect
6666
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
6767
github.com/davecgh/go-spew v1.1.1 // indirect
68-
github.com/docker/distribution v2.8.2+incompatible // indirect
69-
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
68+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
7069
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
7170
github.com/felixge/httpsnoop v1.0.4 // indirect
7271
github.com/fsnotify/fsnotify v1.7.0 // indirect
7372
github.com/go-ini/ini v1.67.0
74-
github.com/go-logr/logr v1.3.0 // indirect
73+
github.com/go-logr/logr v1.4.1 // indirect
7574
github.com/go-logr/stdr v1.2.2 // indirect
7675
github.com/go-openapi/jsonpointer v0.19.6 // indirect
7776
github.com/go-openapi/jsonreference v0.20.2 // indirect
@@ -81,12 +80,12 @@ require (
8180
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
8281
github.com/golang-jwt/jwt/v5 v5.0.0 // indirect
8382
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
84-
github.com/google/cel-go v0.16.1 // indirect
83+
github.com/google/cel-go v0.17.7 // indirect
8584
github.com/google/gnostic-models v0.6.8 // indirect
8685
github.com/google/go-cmp v0.6.0 // indirect
8786
github.com/google/gofuzz v1.2.0 // indirect
8887
github.com/google/pprof v0.0.0-20230602010524-ada837c32108 // indirect
89-
github.com/google/uuid v1.4.0 // indirect
88+
github.com/google/uuid v1.5.0 // indirect
9089
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
9190
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
9291
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -102,7 +101,7 @@ require (
102101
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
103102
github.com/onsi/ginkgo/v2 v2.13.2
104103
github.com/opencontainers/go-digest v1.0.0 // indirect
105-
github.com/opencontainers/selinux v1.10.0 // indirect
104+
github.com/opencontainers/selinux v1.11.0 // indirect
106105
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
107106
github.com/pkg/errors v0.9.1
108107
github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -114,9 +113,9 @@ require (
114113
github.com/spf13/cobra v1.8.0 // indirect
115114
github.com/spf13/pflag v1.0.5 // indirect
116115
github.com/stoewer/go-strcase v1.2.0 // indirect
117-
go.etcd.io/etcd/api/v3 v3.5.9 // indirect
118-
go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
119-
go.etcd.io/etcd/client/v3 v3.5.9 // indirect
116+
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
117+
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
118+
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
120119
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
121120
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0 // indirect
122121
go.opentelemetry.io/otel v1.20.0 // indirect
@@ -132,7 +131,7 @@ require (
132131
golang.org/x/crypto v0.17.0 // indirect
133132
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
134133
golang.org/x/oauth2 v0.11.0 // indirect
135-
golang.org/x/sync v0.5.0
134+
golang.org/x/sync v0.6.0
136135
golang.org/x/sys v0.15.0 // indirect
137136
golang.org/x/term v0.15.0 // indirect
138137
golang.org/x/text v0.14.0 // indirect
@@ -147,49 +146,55 @@ require (
147146
gopkg.in/yaml.v2 v2.4.0 // indirect
148147
gopkg.in/yaml.v3 v3.0.1 // indirect
149148
k8s.io/apiextensions-apiserver v0.0.0 // indirect
150-
k8s.io/apiserver v0.28.4
151-
k8s.io/cloud-provider v0.28.4 // indirect
152-
k8s.io/component-helpers v0.28.4 // indirect
153-
k8s.io/controller-manager v0.28.4 // indirect
154-
k8s.io/kms v0.28.4 // indirect
155-
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
149+
k8s.io/apiserver v0.29.0
150+
k8s.io/cloud-provider v0.29.0 // indirect
151+
k8s.io/component-helpers v0.29.0 // indirect
152+
k8s.io/controller-manager v0.29.0 // indirect
153+
k8s.io/kms v0.29.0 // indirect
154+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
156155
k8s.io/kubectl v0.0.0 // indirect
157-
k8s.io/kubelet v0.28.4 // indirect
158-
k8s.io/pod-security-admission v0.28.4
159-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
160-
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.0-20231205023417-1ba5a224ab0e
156+
k8s.io/kubelet v0.29.0 // indirect
157+
k8s.io/pod-security-admission v0.29.0
158+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
159+
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.0-20240105075710-c4d4895a970b
161160
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
162-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
161+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
162+
)
163+
164+
require (
165+
github.com/distribution/reference v0.5.0 // indirect
166+
github.com/gorilla/websocket v1.5.0 // indirect
167+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
163168
)
164169

165170
replace (
166-
k8s.io/api => k8s.io/api v0.28.4
167-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.4
168-
k8s.io/apimachinery => k8s.io/apimachinery v0.28.4
169-
k8s.io/apiserver => k8s.io/apiserver v0.28.4
170-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.4
171-
k8s.io/client-go => k8s.io/client-go v0.28.4
172-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.4
173-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.4
174-
k8s.io/code-generator => k8s.io/code-generator v0.28.4
175-
k8s.io/component-base => k8s.io/component-base v0.28.4
176-
k8s.io/component-helpers => k8s.io/component-helpers v0.28.4
177-
k8s.io/controller-manager => k8s.io/controller-manager v0.28.4
178-
k8s.io/cri-api => k8s.io/cri-api v0.28.4
179-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.4
180-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.28.4
181-
k8s.io/endpointslice => k8s.io/endpointslice v0.28.4
182-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.4
183-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.4
184-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.4
185-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.4
186-
k8s.io/kubectl => k8s.io/kubectl v0.28.4
187-
k8s.io/kubelet => k8s.io/kubelet v0.28.4
188-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.4
189-
k8s.io/metrics => k8s.io/metrics v0.28.4
190-
k8s.io/mount-utils => k8s.io/mount-utils v0.28.4
191-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.4
192-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.4
193-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.28.4
194-
k8s.io/sample-controller => k8s.io/sample-controller v0.28.4
171+
k8s.io/api => k8s.io/api v0.29.0
172+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.0
173+
k8s.io/apimachinery => k8s.io/apimachinery v0.29.0
174+
k8s.io/apiserver => k8s.io/apiserver v0.29.0
175+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.0
176+
k8s.io/client-go => k8s.io/client-go v0.29.0
177+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.0
178+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.0
179+
k8s.io/code-generator => k8s.io/code-generator v0.29.0
180+
k8s.io/component-base => k8s.io/component-base v0.29.0
181+
k8s.io/component-helpers => k8s.io/component-helpers v0.29.0
182+
k8s.io/controller-manager => k8s.io/controller-manager v0.29.0
183+
k8s.io/cri-api => k8s.io/cri-api v0.29.0
184+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.0
185+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.0
186+
k8s.io/endpointslice => k8s.io/endpointslice v0.29.0
187+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.0
188+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.0
189+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.0
190+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.0
191+
k8s.io/kubectl => k8s.io/kubectl v0.29.0
192+
k8s.io/kubelet => k8s.io/kubelet v0.29.0
193+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.0
194+
k8s.io/metrics => k8s.io/metrics v0.29.0
195+
k8s.io/mount-utils => k8s.io/mount-utils v0.29.0
196+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.0
197+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.0
198+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.29.0
199+
k8s.io/sample-controller => k8s.io/sample-controller v0.29.0
195200
)

0 commit comments

Comments
 (0)