Skip to content

Commit 5bb2184

Browse files
Merge pull request #133285 from yue9944882/automated-cherry-pick-of-#132895-upstream-release-1.33
Automated cherry pick of #132895: Fixes scheduler nil panic due to empty init container request&limit Kubernetes-commit: be53c1eab06358500780ca538964cf3de9d9cc45
1 parent 73b7531 commit 5bb2184

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ godebug default=go1.24
99
require (
1010
github.com/google/go-cmp v0.7.0
1111
github.com/stretchr/testify v1.10.0
12-
k8s.io/api v0.0.0-20250401102040-dc8867983a6e
13-
k8s.io/apimachinery v0.0.0-20250411020758-955939ffb819
12+
k8s.io/api v0.0.0-20250411021314-16cedc7a66ae
13+
k8s.io/apimachinery v0.0.0-20250513120515-173776a0582d
1414
k8s.io/client-go v0.0.0-20250411022055-ecbbb0606499
1515
k8s.io/klog/v2 v2.130.1
1616
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,10 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
132132
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
133133
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
134134
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
135-
k8s.io/api v0.0.0-20250401102040-dc8867983a6e h1:oY/yt517XLctfPgsZl3UBOunhhwj3p957k5ptQZIl7A=
136-
k8s.io/api v0.0.0-20250401102040-dc8867983a6e/go.mod h1:FFhGt5u35h2C+LO52B0n4kxNjVzqZJieArQBpannX+s=
137-
k8s.io/apimachinery v0.0.0-20250411020758-955939ffb819 h1:m17pTPsx0pRmIhMKKtNBYrT1LitJNib+nLiuIc8Fvk8=
138-
k8s.io/apimachinery v0.0.0-20250411020758-955939ffb819/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
135+
k8s.io/api v0.0.0-20250411021314-16cedc7a66ae h1:vrcVMXGw+KvS3H1ADWBP3OnVjHD8POhZ2TTOhVZSrwU=
136+
k8s.io/api v0.0.0-20250411021314-16cedc7a66ae/go.mod h1:qoOZZa+05qIrm+4Sofop9RA1fVI3J149R2j6jm9m3VQ=
137+
k8s.io/apimachinery v0.0.0-20250513120515-173776a0582d h1:buOcd3rCTo99nqYltxp0diwOlu3UosLheP/6o6MxnuY=
138+
k8s.io/apimachinery v0.0.0-20250513120515-173776a0582d/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
139139
k8s.io/client-go v0.0.0-20250411022055-ecbbb0606499 h1:EeffLakm6zD0zaErZUz+i6YubAlH+1a+MFp2cgg/cIQ=
140140
k8s.io/client-go v0.0.0-20250411022055-ecbbb0606499/go.mod h1:CSliY+JGJ3zwXBe0NeVh0FlLHVuJ536ahxiFoMzAXbw=
141141
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=

0 commit comments

Comments
 (0)