Merge pull request #126151 from xyz-li/cherrpick-125145-129

cherry pick of #125145 apiserver fix watch namespace

Kubernetes-commit: a18cf5d10a21bd7a767615ddad85e7e200bb04e1

go.mod

@@ -42,7 +42,7 @@ require (
 	google.golang.org/protobuf v1.33.0
 	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/api v0.0.0-20240718103906-7c71f3c0b7a7
 	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

go.sum

@@ -393,8 +393,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 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/api v0.0.0-20240718103906-7c71f3c0b7a7 h1:yum8NOR/ysIRWDiCZuVbLvHCmeuM2KHc/8voO+xoivw=
+k8s.io/api v0.0.0-20240718103906-7c71f3c0b7a7/go.mod h1:AFqQkkEfmsUH52cPeKeWVm6eQZJUan7p62A0JEH+azM=
 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=