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

Fix admission error on podresources e2e test
This commit is contained in:
Kubernetes Prow Robot 2024-03-21 14:14:13 -07:00 committed by GitHub
commit 95a6f2e4dc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -447,12 +447,12 @@ func podresourcesListTests(ctx context.Context, f *framework.Framework, cli kube
cntName: "cnt-00", cntName: "cnt-00",
resourceName: sd.resourceName, resourceName: sd.resourceName,
resourceAmount: 1, resourceAmount: 1,
cpuRequest: 2000, cpuRequest: 1000,
}, },
{ {
podName: "pod-02", podName: "pod-02",
cntName: "cnt-00", cntName: "cnt-00",
cpuRequest: 2000, cpuRequest: 1000,
}, },
{ {
podName: "pod-03", podName: "pod-03",
@ -471,12 +471,12 @@ func podresourcesListTests(ctx context.Context, f *framework.Framework, cli kube
{ {
podName: "pod-01", podName: "pod-01",
cntName: "cnt-00", cntName: "cnt-00",
cpuRequest: 2000, cpuRequest: 1000,
}, },
{ {
podName: "pod-02", podName: "pod-02",
cntName: "cnt-00", cntName: "cnt-00",
cpuRequest: 2000, cpuRequest: 1000,
}, },
{ {
podName: "pod-03", podName: "pod-03",
@ -503,12 +503,12 @@ func podresourcesListTests(ctx context.Context, f *framework.Framework, cli kube
cntName: "cnt-00", cntName: "cnt-00",
resourceName: sd.resourceName, resourceName: sd.resourceName,
resourceAmount: 1, resourceAmount: 1,
cpuRequest: 2000, cpuRequest: 1000,
}, },
{ {
podName: "pod-02", podName: "pod-02",
cntName: "cnt-00", cntName: "cnt-00",
cpuRequest: 2000, cpuRequest: 1000,
}, },
} }
} else { } else {
@ -520,12 +520,12 @@ func podresourcesListTests(ctx context.Context, f *framework.Framework, cli kube
{ {
podName: "pod-01", podName: "pod-01",
cntName: "cnt-00", cntName: "cnt-00",
cpuRequest: 2000, cpuRequest: 1000,
}, },
{ {
podName: "pod-02", podName: "pod-02",
cntName: "cnt-00", cntName: "cnt-00",
cpuRequest: 2000, cpuRequest: 1000,
}, },
} }
} }
@ -791,7 +791,7 @@ func podresourcesGetTests(ctx context.Context, f *framework.Framework, cli kubel
{ {
podName: "pod-01", podName: "pod-01",
cntName: "cnt-00", cntName: "cnt-00",
cpuRequest: 2000, cpuRequest: 1000,
}, },
} }
tpd.createPodsForTest(ctx, f, expected) tpd.createPodsForTest(ctx, f, expected)
@ -812,7 +812,7 @@ func podresourcesGetTests(ctx context.Context, f *framework.Framework, cli kubel
{ {
podName: "pod-01", podName: "pod-01",
cntName: "cnt-00", cntName: "cnt-00",
cpuRequest: 2000, cpuRequest: 1000,
initContainers: []initContainerDesc{ initContainers: []initContainerDesc{
{ {
cntName: "init-00", cntName: "init-00",
@ -820,7 +820,7 @@ func podresourcesGetTests(ctx context.Context, f *framework.Framework, cli kubel
}, },
{ {
cntName: "restartable-init-01", cntName: "restartable-init-01",
cpuRequest: 2000, cpuRequest: 1000,
restartPolicy: &containerRestartPolicyAlways, restartPolicy: &containerRestartPolicyAlways,
}, },
}, },