Skip to content

Commit 3028650

Browse files
authored
Merge pull request #1574 from kubernetes-sigs/CVE-2023-5528-1.26
[release-1.26] fix: CVE-2023-5528
2 parents 00a4cf4 + 07bacc7 commit 3028650

File tree

41 files changed

+4371
-1103
lines changed

Some content is hidden

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

41 files changed

+4371
-1103
lines changed

go.mod

Lines changed: 41 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@ require (
1919
github.com/pborman/uuid v1.2.0
2020
github.com/pelletier/go-toml v1.9.4
2121
github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021
22-
github.com/stretchr/testify v1.8.1
22+
github.com/stretchr/testify v1.8.3
2323
golang.org/x/net v0.18.0
2424
google.golang.org/grpc v1.59.0
2525
google.golang.org/protobuf v1.31.0
26-
k8s.io/api v0.26.10
27-
k8s.io/apimachinery v0.26.10
28-
k8s.io/client-go v0.26.10
29-
k8s.io/cloud-provider v0.26.10
30-
k8s.io/component-base v0.26.10
31-
k8s.io/klog/v2 v2.80.1
32-
k8s.io/kubernetes v1.26.10
33-
k8s.io/mount-utils v0.0.0
34-
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
26+
k8s.io/api v0.26.11
27+
k8s.io/apimachinery v0.26.11
28+
k8s.io/client-go v0.26.11
29+
k8s.io/cloud-provider v0.26.11
30+
k8s.io/component-base v0.26.11
31+
k8s.io/klog/v2 v2.90.1
32+
k8s.io/kubernetes v1.26.11
33+
k8s.io/mount-utils v0.27.8
34+
k8s.io/utils v0.0.0-20230209194617-a36077c30491
3535
sigs.k8s.io/cloud-provider-azure v1.26.1-0.20230117121033-188ebdf2a417
3636
sigs.k8s.io/yaml v1.3.0
3737
)
@@ -41,7 +41,7 @@ require (
4141
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.2.0
4242
github.com/jongio/azidext/go/azidext v0.4.0
4343
github.com/onsi/ginkgo/v2 v2.7.0
44-
k8s.io/pod-security-admission v0.26.10
44+
k8s.io/pod-security-admission v0.26.11
4545
)
4646

4747
require (
@@ -77,7 +77,7 @@ require (
7777
github.com/google/go-cmp v0.5.9 // indirect
7878
github.com/google/gofuzz v1.1.0 // indirect
7979
github.com/google/uuid v1.3.1 // indirect
80-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
80+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect
8181
github.com/imdario/mergo v0.3.9 // indirect
8282
github.com/inconshreveable/mousetrap v1.0.1 // indirect
8383
github.com/jmespath/go-jmespath v0.4.0 // indirect
@@ -117,7 +117,7 @@ require (
117117
golang.org/x/sys v0.14.0 // indirect
118118
golang.org/x/term v0.14.0 // indirect
119119
golang.org/x/text v0.14.0 // indirect
120-
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
120+
golang.org/x/time v0.3.0 // indirect
121121
google.golang.org/appengine v1.6.7 // indirect
122122
google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 // indirect
123123
google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
@@ -126,8 +126,8 @@ require (
126126
gopkg.in/yaml.v2 v2.4.0 // indirect
127127
gopkg.in/yaml.v3 v3.0.1 // indirect
128128
k8s.io/apiextensions-apiserver v0.0.0 // indirect
129-
k8s.io/apiserver v0.26.10 // indirect
130-
k8s.io/component-helpers v0.26.10 // indirect
129+
k8s.io/apiserver v0.26.11 // indirect
130+
k8s.io/component-helpers v0.26.11 // indirect
131131
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
132132
k8s.io/kubectl v0.0.0 // indirect
133133
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.37 // indirect
@@ -136,35 +136,33 @@ require (
136136
)
137137

138138
replace (
139-
github.com/container-storage-interface/spec => github.com/container-storage-interface/spec v1.5.0
140139
github.com/niemeyer/pretty => github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e
141140
github.com/onsi/ginkgo/v2 => github.com/onsi/ginkgo/v2 v2.4.0
142141
go.etcd.io/etcd => go.etcd.io/etcd v0.0.0-20200410171415-59f5fb25a533
143-
k8s.io/api => k8s.io/api v0.26.10
144-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.10
145-
k8s.io/apimachinery => k8s.io/apimachinery v0.26.10
146-
k8s.io/apiserver => k8s.io/apiserver v0.26.10
147-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.10
148-
k8s.io/client-go => k8s.io/client-go v0.26.10
149-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.10
150-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.10
151-
k8s.io/code-generator => k8s.io/code-generator v0.26.10
152-
k8s.io/component-base => k8s.io/component-base v0.26.10
153-
k8s.io/component-helpers => k8s.io/component-helpers v0.26.10
154-
k8s.io/controller-manager => k8s.io/controller-manager v0.26.10
155-
k8s.io/cri-api => k8s.io/cri-api v0.26.10
156-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.10
157-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.10
158-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.10
159-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.10
160-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.10
161-
k8s.io/kubectl => k8s.io/kubectl v0.26.10
162-
k8s.io/kubelet => k8s.io/kubelet v0.26.10
163-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.10
164-
k8s.io/metrics => k8s.io/metrics v0.26.10
165-
k8s.io/mount-utils => k8s.io/mount-utils v0.0.0-20230103133730-1df1a57439e2
166-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.10
167-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.10
168-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.10
169-
k8s.io/sample-controller => k8s.io/sample-controller v0.26.10
142+
k8s.io/api => k8s.io/api v0.26.11
143+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.11
144+
k8s.io/apimachinery => k8s.io/apimachinery v0.26.11
145+
k8s.io/apiserver => k8s.io/apiserver v0.26.11
146+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.11
147+
k8s.io/client-go => k8s.io/client-go v0.26.11
148+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.11
149+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.11
150+
k8s.io/code-generator => k8s.io/code-generator v0.26.11
151+
k8s.io/component-base => k8s.io/component-base v0.26.11
152+
k8s.io/component-helpers => k8s.io/component-helpers v0.26.11
153+
k8s.io/controller-manager => k8s.io/controller-manager v0.26.11
154+
k8s.io/cri-api => k8s.io/cri-api v0.26.11
155+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.11
156+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.11
157+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.11
158+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.11
159+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.11
160+
k8s.io/kubectl => k8s.io/kubectl v0.26.11
161+
k8s.io/kubelet => k8s.io/kubelet v0.26.11
162+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.11
163+
k8s.io/metrics => k8s.io/metrics v0.26.11
164+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.11
165+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.11
166+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.11
167+
k8s.io/sample-controller => k8s.io/sample-controller v0.26.11
170168
)

0 commit comments

Comments
 (0)