Merge pull request #124294 from dims/automated-cherry-pick-of-#124283…

…-upstream-release-1.29

Automated cherry pick of #124283: Rename `cluster` to `storage_cluster_id` for

Kubernetes-commit: 61fce014473ffe6eb0418b52c5665ac2014adeb9

go.mod

@@ -43,8 +43,8 @@ require (
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 	gopkg.in/square/go-jose.v2 v2.6.0
 	k8s.io/api v0.0.0-20240404161350-448db12cecfb
-	k8s.io/apimachinery v0.0.0-20240404161013-3e7c65a7bc4d
-	k8s.io/client-go v0.0.0-20240404162704-0058eeef6a23
+	k8s.io/apimachinery v0.0.0-20240405121012-2bbf53022625
+	k8s.io/client-go v0.0.0-20240405121907-1e7adee6a0ce
 	k8s.io/component-base v0.0.0-20240404163600-1c2da834f8fb
 	k8s.io/klog/v2 v2.110.1
 	k8s.io/kms v0.0.0-20240404163946-358457739050

go.sum

@@ -395,10 +395,10 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 k8s.io/api v0.0.0-20240404161350-448db12cecfb h1:/uYBtjPF21kf1qLyVVXGQOcFcjjqGowAssqopfbjQB0=
 k8s.io/api v0.0.0-20240404161350-448db12cecfb/go.mod h1:dPhF9d7Kl/mI8T1SzZBp2/saFzES5J24O1PGAwNajB0=
-k8s.io/apimachinery v0.0.0-20240404161013-3e7c65a7bc4d h1:bth65kuQyrmaqeI1unRAE9O4KtHWeblZ8mIZEjpOuc4=
-k8s.io/apimachinery v0.0.0-20240404161013-3e7c65a7bc4d/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y=
-k8s.io/client-go v0.0.0-20240404162704-0058eeef6a23 h1:hByyJAlM0bM9BNoT1dP0Ty9lc6bA5rheUtXDjbR8Ldw=
-k8s.io/client-go v0.0.0-20240404162704-0058eeef6a23/go.mod h1:FV/EgUZ4sWpLZgNY0A6/58fw4PqqSiIypAF12Ma6Rno=
+k8s.io/apimachinery v0.0.0-20240405121012-2bbf53022625 h1:itYkKr52W3ugNsYoBZwpwcezu/vPxg3GK7XVkX24GAo=
+k8s.io/apimachinery v0.0.0-20240405121012-2bbf53022625/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y=
+k8s.io/client-go v0.0.0-20240405121907-1e7adee6a0ce h1:z43ZNSMgeAmGh1n7NYStCKb0ZzlJvZje79+PbHMcaRM=
+k8s.io/client-go v0.0.0-20240405121907-1e7adee6a0ce/go.mod h1:WUmefL+57tMtrBz2EEfhBeTSndZv0F1xjA8LCWMs7/k=
 k8s.io/component-base v0.0.0-20240404163600-1c2da834f8fb h1:fwRjV6mSoBicYMk9toq/gR9OKejTTMLNz3GrpSxGiVQ=
 k8s.io/component-base v0.0.0-20240404163600-1c2da834f8fb/go.mod h1:+gCwF0bpI48To/oAhk40oP3fMfzpjdTO4uKakcAhUfU=
 k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=