Skip to content

Commit 6ceb09e

Browse files
authored
Merge pull request #1752 from andyzhangx/upgrade-mount-utils-v1.32.0-1.25
[release-1.25] chore: upgrade k8s.io/mount-utils to v1.32.0
2 parents 1e4d46e + 204ad50 commit 6ceb09e

File tree

14 files changed

+465
-54
lines changed

14 files changed

+465
-54
lines changed

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ require (
3535
k8s.io/component-base v0.31.3
3636
k8s.io/klog/v2 v2.130.1
3737
k8s.io/kubernetes v1.31.1
38-
k8s.io/mount-utils v0.31.1
38+
k8s.io/mount-utils v0.32.0
3939
k8s.io/pod-security-admission v0.31.1
40-
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6
40+
k8s.io/utils v0.0.0-20241210054802-24370beab758
4141
sigs.k8s.io/cloud-provider-azure v1.31.1-0.20241203125659-88ef46cb15b8
4242
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.2.2
4343
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.1.8
@@ -106,7 +106,8 @@ require (
106106
github.com/kylelemons/godebug v1.1.0 // indirect
107107
github.com/mailru/easyjson v0.7.7 // indirect
108108
github.com/moby/spdystream v0.4.0 // indirect
109-
github.com/moby/sys/mountinfo v0.7.1 // indirect
109+
github.com/moby/sys/mountinfo v0.7.2 // indirect
110+
github.com/moby/sys/userns v0.1.0 // indirect
110111
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
111112
github.com/modern-go/reflect2 v1.0.2 // indirect
112113
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -196,7 +197,6 @@ replace (
196197
k8s.io/kubernetes => k8s.io/kubernetes v1.31.3
197198
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.3
198199
k8s.io/metrics => k8s.io/metrics v0.31.3
199-
k8s.io/mount-utils => k8s.io/mount-utils v0.29.7
200200
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.3
201201
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.3
202202
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.31.3

go.sum

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,10 @@ github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0
202202
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
203203
github.com/moby/spdystream v0.4.0 h1:Vy79D6mHeJJjiPdFEL2yku1kl0chZpJfZcPpb16BRl8=
204204
github.com/moby/spdystream v0.4.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI=
205-
github.com/moby/sys/mountinfo v0.7.1 h1:/tTvQaSJRr2FshkhXiIpux6fQ2Zvc4j7tAhMTStAG2g=
206-
github.com/moby/sys/mountinfo v0.7.1/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI=
205+
github.com/moby/sys/mountinfo v0.7.2 h1:1shs6aH5s4o5H2zQLn796ADW1wMrIwHsyJ2v9KouLrg=
206+
github.com/moby/sys/mountinfo v0.7.2/go.mod h1:1YOa8w8Ih7uW0wALDUgT1dTTSBrZ+HiBLGws92L2RU4=
207+
github.com/moby/sys/userns v0.1.0 h1:tVLXkFOxVu9A64/yh59slHVv9ahO9UIev4JZusOLG/g=
208+
github.com/moby/sys/userns v0.1.0/go.mod h1:IHUYgu/kao6N8YZlp9Cf444ySSvCmDlmzUcYfDHOl28=
207209
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
208210
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
209211
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -458,12 +460,12 @@ k8s.io/kubelet v0.31.3 h1:DIXRAmvVGp42mV2vpA1GCLU6oO8who0/vp3Oq6kSpbI=
458460
k8s.io/kubelet v0.31.3/go.mod h1:KSdbEfNy5VzqUlAHlytA/fH12s+sE1u8fb/8JY9sL/8=
459461
k8s.io/kubernetes v1.31.3 h1:oqb7HdfnTelrGlZ6ziNugvQ/L/aJWR704114EAhUn9Q=
460462
k8s.io/kubernetes v1.31.3/go.mod h1:9xmT2buyTYj8TRKwRae7FcuY8k5+xlxv7VivvO0KKfs=
461-
k8s.io/mount-utils v0.29.7 h1:M0LA8Tx8HtpwBy24fajiUsaklIiNi1tNrHpROxX4bLI=
462-
k8s.io/mount-utils v0.29.7/go.mod h1:SHUMR9n3b6tLgEmlyT36cL6fV6Sjwa5CJhc0guCXvb0=
463+
k8s.io/mount-utils v0.32.0 h1:KOQAhPzJICATXnc6XCkWoexKbkOexRnMCUW8APFfwg4=
464+
k8s.io/mount-utils v0.32.0/go.mod h1:Kun5c2svjAPx0nnvJKYQWhfeNW+O0EpzHgRhDcYoSY0=
463465
k8s.io/pod-security-admission v0.31.3 h1:8NzEV0HtdStX367AuSKfRMIZHn0hT4xuz8xNEf7/zO8=
464466
k8s.io/pod-security-admission v0.31.3/go.mod h1:YMIcTe/7f9R9d+3ErCMMM3Wtbj9ejKo7Z9S0OxZQrRg=
465-
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 h1:MDF6h2H/h4tbzmtIKTuctcwZmY0tY9mD9fNT47QO6HI=
466-
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
467+
k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0=
468+
k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
467469
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 h1:2770sDpzrjjsAtVhSeUFseziht227YAWYHLGNM8QPwY=
468470
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
469471
sigs.k8s.io/cloud-provider-azure v1.31.1-0.20241203125659-88ef46cb15b8 h1:fU12bBJISgnXalsTFsKvoWe254GJ4CnKc1Nbs3tZV6o=

vendor/github.com/moby/sys/mountinfo/mounted_linux.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/moby/sys/userns/LICENSE

Lines changed: 202 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/moby/sys/userns/userns.go

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/moby/sys/userns/userns_linux.go

Lines changed: 53 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/moby/sys/userns/userns_linux_fuzzer.go

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/moby/sys/userns/userns_unsupported.go

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/mount-utils/mount_helper_unix.go

Lines changed: 7 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)