Skip to content

Commit 74408ab

Browse files
andyzhangxandyzhangx
authored
Merge pull request #1254 from andyzhangx/matchtags-fix-1.23
[release-1.23] fix: match tags issue in account search logic
2 parents 7e7b997 + 7b5a929 commit 74408ab

File tree

977 files changed

+44774
-30414
lines changed

Some content is hidden

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

977 files changed

+44774
-30414
lines changed

‎go.mod‎

Lines changed: 78 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -6,53 +6,59 @@ toolchain go1.21.4
66

77
require (
88
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible
9-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0
9+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1
1010
github.com/Azure/go-autorest/autorest v0.11.29
1111
github.com/Azure/go-autorest/autorest/adal v0.9.23
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.13.0
19-
github.com/onsi/gomega v1.30.0
18+
github.com/onsi/gomega v1.31.1
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
23-
golang.org/x/net v0.17.0
22+
golang.org/x/net v0.20.0
2423
google.golang.org/grpc v1.59.0
2524
google.golang.org/protobuf v1.31.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
25+
k8s.io/api v0.29.2
26+
k8s.io/apimachinery v0.29.2
27+
k8s.io/client-go v0.29.2
28+
k8s.io/component-base v0.29.0
3029
k8s.io/klog/v2 v2.110.1
31-
k8s.io/kubernetes v1.28.4
32-
k8s.io/mount-utils v0.28.4
30+
k8s.io/kubernetes v1.29.0
31+
k8s.io/mount-utils v0.29.0
3332
k8s.io/utils v0.0.0-20231127182322-b307cd553661
34-
sigs.k8s.io/cloud-provider-azure v1.27.1-0.20231213062409-f1ce7de3fdcb
33+
sigs.k8s.io/cloud-provider-azure v1.27.1-0.20240220055818-b76605c9c708
3534
sigs.k8s.io/yaml v1.4.0
3635
)
3736

3837
require (
39-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.0
38+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.2
4039
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/keyvault/armkeyvault v1.4.0
4140
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.1.0
4241
github.com/go-ini/ini v1.67.0
43-
github.com/onsi/ginkgo/v2 v2.13.2
42+
github.com/onsi/ginkgo/v2 v2.15.0
4443
github.com/pkg/errors v0.9.1
4544
github.com/satori/go.uuid v1.2.0
46-
k8s.io/apiserver v0.28.4
47-
k8s.io/pod-security-admission v0.28.4
48-
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.0-20231205023417-1ba5a224ab0e
45+
k8s.io/apiserver v0.29.0
46+
k8s.io/pod-security-admission v0.29.0
47+
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.0-20240218020800-ba9f211f36bf
4948
)
5049

5150
require (
52-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.0 // indirect
53-
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 v5.3.0 // indirect
51+
github.com/distribution/reference v0.5.0 // indirect
52+
github.com/gorilla/websocket v1.5.0 // indirect
53+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
54+
go.uber.org/mock v0.4.0
55+
)
56+
57+
require (
58+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2 // indirect
59+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 v5.5.0 // indirect
5460
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerregistry/armcontainerregistry v1.2.0 // indirect
55-
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v4 v4.6.0 // indirect
61+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v4 v4.7.0 // indirect
5662
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v4 v4.3.0 // indirect
5763
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/privatedns/armprivatedns v1.2.0 // indirect
5864
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.2.0
@@ -63,7 +69,7 @@ require (
6369
github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
6470
github.com/Azure/go-autorest/logger v0.2.1 // indirect
6571
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
66-
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.0 // indirect
72+
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 // indirect
6773
github.com/NYTimes/gziphandler v1.1.1 // indirect
6874
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
6975
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
@@ -74,27 +80,26 @@ require (
7480
github.com/coreos/go-semver v0.3.1 // indirect
7581
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
7682
github.com/davecgh/go-spew v1.1.1 // indirect
77-
github.com/docker/distribution v2.8.2+incompatible // indirect
78-
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
79-
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
83+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
84+
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
8085
github.com/felixge/httpsnoop v1.0.4 // indirect
8186
github.com/fsnotify/fsnotify v1.7.0 // indirect
82-
github.com/go-logr/logr v1.3.0 // indirect
87+
github.com/go-logr/logr v1.4.1 // indirect
8388
github.com/go-logr/stdr v1.2.2 // indirect
8489
github.com/go-openapi/jsonpointer v0.19.6 // indirect
8590
github.com/go-openapi/jsonreference v0.20.2 // indirect
8691
github.com/go-openapi/swag v0.22.4 // indirect
8792
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
8893
github.com/gogo/protobuf v1.3.2 // indirect
8994
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
90-
github.com/golang-jwt/jwt/v5 v5.0.0 // indirect
95+
github.com/golang-jwt/jwt/v5 v5.2.0 // indirect
9196
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
92-
github.com/google/cel-go v0.16.1 // indirect
97+
github.com/google/cel-go v0.17.7 // indirect
9398
github.com/google/gnostic-models v0.6.8 // indirect
9499
github.com/google/go-cmp v0.6.0 // indirect
95100
github.com/google/gofuzz v1.2.0 // indirect
96101
github.com/google/pprof v0.0.0-20230602010524-ada837c32108 // indirect
97-
github.com/google/uuid v1.4.0 // indirect
102+
github.com/google/uuid v1.6.0 // indirect
98103
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
99104
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
100105
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -109,8 +114,8 @@ require (
109114
github.com/modern-go/reflect2 v1.0.2 // indirect
110115
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
111116
github.com/opencontainers/go-digest v1.0.0 // indirect
112-
github.com/opencontainers/selinux v1.10.0 // indirect
113-
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
117+
github.com/opencontainers/selinux v1.11.0 // indirect
118+
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
114119
github.com/pmezard/go-difflib v1.0.0 // indirect
115120
github.com/prometheus/client_golang v1.16.0 // indirect
116121
github.com/prometheus/client_model v0.4.0 // indirect
@@ -119,9 +124,9 @@ require (
119124
github.com/spf13/cobra v1.8.0 // indirect
120125
github.com/spf13/pflag v1.0.5 // indirect
121126
github.com/stoewer/go-strcase v1.2.0 // indirect
122-
go.etcd.io/etcd/api/v3 v3.5.9 // indirect
123-
go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
124-
go.etcd.io/etcd/client/v3 v3.5.9 // indirect
127+
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
128+
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
129+
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
125130
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
126131
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0 // indirect
127132
go.opentelemetry.io/otel v1.20.0 // indirect
@@ -134,15 +139,15 @@ require (
134139
go.uber.org/atomic v1.10.0 // indirect
135140
go.uber.org/multierr v1.11.0 // indirect
136141
go.uber.org/zap v1.19.0 // indirect
137-
golang.org/x/crypto v0.17.0 // indirect
142+
golang.org/x/crypto v0.19.0 // indirect
138143
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
139144
golang.org/x/oauth2 v0.11.0 // indirect
140-
golang.org/x/sync v0.5.0
141-
golang.org/x/sys v0.15.0 // indirect
142-
golang.org/x/term v0.15.0 // indirect
145+
golang.org/x/sync v0.6.0
146+
golang.org/x/sys v0.17.0 // indirect
147+
golang.org/x/term v0.17.0 // indirect
143148
golang.org/x/text v0.14.0 // indirect
144149
golang.org/x/time v0.5.0 // indirect
145-
golang.org/x/tools v0.14.0 // indirect
150+
golang.org/x/tools v0.16.1 // indirect
146151
google.golang.org/appengine v1.6.7 // indirect
147152
google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 // indirect
148153
google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
@@ -152,47 +157,47 @@ require (
152157
gopkg.in/yaml.v2 v2.4.0 // indirect
153158
gopkg.in/yaml.v3 v3.0.1 // indirect
154159
k8s.io/apiextensions-apiserver v0.0.0 // indirect
155-
k8s.io/cloud-provider v0.28.4 // indirect
156-
k8s.io/component-helpers v0.28.4 // indirect
157-
k8s.io/controller-manager v0.28.4 // indirect
158-
k8s.io/kms v0.28.4 // indirect
159-
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
160+
k8s.io/cloud-provider v0.29.0 // indirect
161+
k8s.io/component-helpers v0.29.0 // indirect
162+
k8s.io/controller-manager v0.29.0 // indirect
163+
k8s.io/kms v0.29.0 // indirect
164+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
160165
k8s.io/kubectl v0.0.0 // indirect
161-
k8s.io/kubelet v0.28.4 // indirect
162-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
163-
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.0-20231205023417-1ba5a224ab0e
166+
k8s.io/kubelet v0.29.0 // indirect
167+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
168+
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.0-20240218020800-ba9f211f36bf
164169
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
165-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
170+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
166171
)
167172

168173
replace (
169174
github.com/niemeyer/pretty => github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e
170175
go.etcd.io/etcd => go.etcd.io/etcd v0.0.0-20200410171415-59f5fb25a533
171-
k8s.io/api => k8s.io/api v0.28.4
172-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.4
173-
k8s.io/apimachinery => k8s.io/apimachinery v0.28.4
174-
k8s.io/apiserver => k8s.io/apiserver v0.28.4
175-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.4
176-
k8s.io/client-go => k8s.io/client-go v0.28.4
177-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.4
178-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.4
179-
k8s.io/code-generator => k8s.io/code-generator v0.28.4
180-
k8s.io/component-base => k8s.io/component-base v0.28.4
181-
k8s.io/component-helpers => k8s.io/component-helpers v0.28.4
182-
k8s.io/controller-manager => k8s.io/controller-manager v0.28.4
183-
k8s.io/cri-api => k8s.io/cri-api v0.28.4
184-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.4
185-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.4
186-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.4
187-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.4
188-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.4
189-
k8s.io/kubectl => k8s.io/kubectl v0.28.4
190-
k8s.io/kubelet => k8s.io/kubelet v0.28.4
191-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.4
192-
k8s.io/metrics => k8s.io/metrics v0.28.4
193-
k8s.io/mount-utils => k8s.io/mount-utils v0.28.4
194-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.4
195-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.4
196-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.28.4
197-
k8s.io/sample-controller => k8s.io/sample-controller v0.28.4
176+
k8s.io/api => k8s.io/api v0.29.0
177+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.0
178+
k8s.io/apimachinery => k8s.io/apimachinery v0.29.0
179+
k8s.io/apiserver => k8s.io/apiserver v0.29.0
180+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.0
181+
k8s.io/client-go => k8s.io/client-go v0.29.0
182+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.0
183+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.0
184+
k8s.io/code-generator => k8s.io/code-generator v0.29.0
185+
k8s.io/component-base => k8s.io/component-base v0.29.0
186+
k8s.io/component-helpers => k8s.io/component-helpers v0.29.0
187+
k8s.io/controller-manager => k8s.io/controller-manager v0.29.0
188+
k8s.io/cri-api => k8s.io/cri-api v0.29.0
189+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.0
190+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.0
191+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.0
192+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.0
193+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.0
194+
k8s.io/kubectl => k8s.io/kubectl v0.29.0
195+
k8s.io/kubelet => k8s.io/kubelet v0.29.0
196+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.0
197+
k8s.io/metrics => k8s.io/metrics v0.29.0
198+
k8s.io/mount-utils => k8s.io/mount-utils v0.29.0
199+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.0
200+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.0
201+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.29.0
202+
k8s.io/sample-controller => k8s.io/sample-controller v0.29.0
198203
)

0 commit comments

Comments
 (0)