Merge remote-tracking branch 'origin/master' into release-1.18

Kubernetes-commit: ee5e5d216da4d3ec8106e3cfc1507599b8787b7b
2026-04-12 00:00:26 +08:00 · 2020-03-04 18:02:38 +00:00
parent 43ac6031e7
commit 331469446e
3 changed files with 16 additions and 13 deletions
@@ -348,15 +348,15 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "026463abc787"
+			"Rev": "b7e08103f9c2"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "2373d029717c"
+			"Rev": "7c34f3d03f36"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "39a9bc1d5a52"
+			"Rev": "c2cd954c1a7f"
 		},
 		{
 			"ImportPath": "k8s.io/code-generator",
@@ -376,7 +376,7 @@
 		},
 		{
 			"ImportPath": "k8s.io/utils",
-			"Rev": "5f6fbceb4c31"
+			"Rev": "0a110f9eb7ab"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/v3",