Merge pull request kubernetes#124010 from bart0sh/PR137-e2e_node-fix-admission-error

k8s-ci-robot · web-flow · commit 95a6f2e4dcc2 · 2024-03-21T14:14:13.000-07:00
Fix admission error on podresources e2e test
diff --git a/test/e2e_node/podresources_test.go b/test/e2e_node/podresources_test.go
@@ -447,12 +447,12 @@ func podresourcesListTests(ctx context.Context, f *framework.Framework, cli kube
 				cntName:        "cnt-00",
 				resourceName:   sd.resourceName,
 				resourceAmount: 1,
-				cpuRequest:     2000,
+				cpuRequest:     1000,
 			},
 			{
 				podName:    "pod-02",
 				cntName:    "cnt-00",
-				cpuRequest: 2000,
+				cpuRequest: 1000,
 			},
 			{
 				podName:        "pod-03",
@@ -471,12 +471,12 @@ func podresourcesListTests(ctx context.Context, f *framework.Framework, cli kube
 			{
 				podName:    "pod-01",
 				cntName:    "cnt-00",
-				cpuRequest: 2000,
+				cpuRequest: 1000,
 			},
 			{
 				podName:    "pod-02",
 				cntName:    "cnt-00",
-				cpuRequest: 2000,
+				cpuRequest: 1000,
 			},
 			{
 				podName:    "pod-03",
@@ -503,12 +503,12 @@ func podresourcesListTests(ctx context.Context, f *framework.Framework, cli kube
 				cntName:        "cnt-00",
 				resourceName:   sd.resourceName,
 				resourceAmount: 1,
-				cpuRequest:     2000,
+				cpuRequest:     1000,
 			},
 			{
 				podName:    "pod-02",
 				cntName:    "cnt-00",
-				cpuRequest: 2000,
+				cpuRequest: 1000,
 			},
 		}
 	} else {
@@ -520,12 +520,12 @@ func podresourcesListTests(ctx context.Context, f *framework.Framework, cli kube
 			{
 				podName:    "pod-01",
 				cntName:    "cnt-00",
-				cpuRequest: 2000,
+				cpuRequest: 1000,
 			},
 			{
 				podName:    "pod-02",
 				cntName:    "cnt-00",
-				cpuRequest: 2000,
+				cpuRequest: 1000,
 			},
 		}
 	}
@@ -791,7 +791,7 @@ func podresourcesGetTests(ctx context.Context, f *framework.Framework, cli kubel
 		{
 			podName:    "pod-01",
 			cntName:    "cnt-00",
-			cpuRequest: 2000,
+			cpuRequest: 1000,
 		},
 	}
 	tpd.createPodsForTest(ctx, f, expected)
@@ -812,15 +812,15 @@ func podresourcesGetTests(ctx context.Context, f *framework.Framework, cli kubel
 			{
 				podName:    "pod-01",
 				cntName:    "cnt-00",
-				cpuRequest: 2000,
+				cpuRequest: 1000,
 				initContainers: []initContainerDesc{
 					{
 						cntName:    "init-00",
 						cpuRequest: 1000,
 					},
 					{
 						cntName:       "restartable-init-01",
-						cpuRequest:    2000,
+						cpuRequest:    1000,
 						restartPolicy: &containerRestartPolicyAlways,
 					},
 				},

Original file line number	Diff line number	Diff line change
`@@ -447,12 +447,12 @@ func podresourcesListTests(ctx context.Context, f *framework.Framework, cli kube`
`447`	`447`	`cntName: "cnt-00",`
`448`	`448`	`resourceName: sd.resourceName,`
`449`	`449`	`resourceAmount: 1,`
`450`		`- cpuRequest: 2000,`
	`450`	`+ cpuRequest: 1000,`
`451`	`451`	`},`
`452`	`452`	`{`
`453`	`453`	`podName: "pod-02",`
`454`	`454`	`cntName: "cnt-00",`
`455`		`- cpuRequest: 2000,`
	`455`	`+ cpuRequest: 1000,`
`456`	`456`	`},`
`457`	`457`	`{`
`458`	`458`	`podName: "pod-03",`
`@@ -471,12 +471,12 @@ func podresourcesListTests(ctx context.Context, f *framework.Framework, cli kube`
`471`	`471`	`{`
`472`	`472`	`podName: "pod-01",`
`473`	`473`	`cntName: "cnt-00",`
`474`		`- cpuRequest: 2000,`
	`474`	`+ cpuRequest: 1000,`
`475`	`475`	`},`
`476`	`476`	`{`
`477`	`477`	`podName: "pod-02",`
`478`	`478`	`cntName: "cnt-00",`
`479`		`- cpuRequest: 2000,`
	`479`	`+ cpuRequest: 1000,`
`480`	`480`	`},`
`481`	`481`	`{`
`482`	`482`	`podName: "pod-03",`
`@@ -503,12 +503,12 @@ func podresourcesListTests(ctx context.Context, f *framework.Framework, cli kube`
`503`	`503`	`cntName: "cnt-00",`
`504`	`504`	`resourceName: sd.resourceName,`
`505`	`505`	`resourceAmount: 1,`
`506`		`- cpuRequest: 2000,`
	`506`	`+ cpuRequest: 1000,`
`507`	`507`	`},`
`508`	`508`	`{`
`509`	`509`	`podName: "pod-02",`
`510`	`510`	`cntName: "cnt-00",`
`511`		`- cpuRequest: 2000,`
	`511`	`+ cpuRequest: 1000,`
`512`	`512`	`},`
`513`	`513`	`}`
`514`	`514`	`} else {`
`@@ -520,12 +520,12 @@ func podresourcesListTests(ctx context.Context, f *framework.Framework, cli kube`
`520`	`520`	`{`
`521`	`521`	`podName: "pod-01",`
`522`	`522`	`cntName: "cnt-00",`
`523`		`- cpuRequest: 2000,`
	`523`	`+ cpuRequest: 1000,`
`524`	`524`	`},`
`525`	`525`	`{`
`526`	`526`	`podName: "pod-02",`
`527`	`527`	`cntName: "cnt-00",`
`528`		`- cpuRequest: 2000,`
	`528`	`+ cpuRequest: 1000,`
`529`	`529`	`},`
`530`	`530`	`}`
`531`	`531`	`}`
`@@ -791,7 +791,7 @@ func podresourcesGetTests(ctx context.Context, f *framework.Framework, cli kubel`
`791`	`791`	`{`
`792`	`792`	`podName: "pod-01",`
`793`	`793`	`cntName: "cnt-00",`
`794`		`- cpuRequest: 2000,`
	`794`	`+ cpuRequest: 1000,`
`795`	`795`	`},`
`796`	`796`	`}`
`797`	`797`	`tpd.createPodsForTest(ctx, f, expected)`
`@@ -812,15 +812,15 @@ func podresourcesGetTests(ctx context.Context, f *framework.Framework, cli kubel`
`812`	`812`	`{`
`813`	`813`	`podName: "pod-01",`
`814`	`814`	`cntName: "cnt-00",`
`815`		`- cpuRequest: 2000,`
	`815`	`+ cpuRequest: 1000,`
`816`	`816`	`initContainers: []initContainerDesc{`
`817`	`817`	`{`
`818`	`818`	`cntName: "init-00",`
`819`	`819`	`cpuRequest: 1000,`
`820`	`820`	`},`
`821`	`821`	`{`
`822`	`822`	`cntName: "restartable-init-01",`
`823`		`- cpuRequest: 2000,`
	`823`	`+ cpuRequest: 1000,`
`824`	`824`	`restartPolicy: &containerRestartPolicyAlways,`
`825`	`825`	`},`
`826`	`826`	`},`