github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #123521 from pohly/dra-e2e-structure

Browse Source 
dra e2e: fix stack unwinding in helper function
This commit is contained in:
Kubernetes Prow Robot
2024-02-27 03:14:40 -08:00
committed by GitHub
parent e457683e6c cb3180950e
commit 47c92e2ab7
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
test/e2e/dra/dra.go
View File

@@ -1128,26 +1128,25 @@ func (b *builder) podExternalMultiple() *v1.Pod {
func (b *builder) create(ctx context.Context, objs ...klog.KMetadata) []klog.KMetadata { func (b *builder) create(ctx context.Context, objs ...klog.KMetadata) []klog.KMetadata {
var createdObjs []klog.KMetadata var createdObjs []klog.KMetadata
for _, obj := range objs { for _, obj := range objs {
ginkgo.By(fmt.Sprintf("creating %T %s", obj, obj.GetName()), func() { ginkgo.By(fmt.Sprintf("creating %T %s", obj, obj.GetName()))
var err error var err error
var createdObj klog.KMetadata var createdObj klog.KMetadata
switch obj := obj.(type) { switch obj := obj.(type) {
case *resourcev1alpha2.ResourceClass: case *resourcev1alpha2.ResourceClass:
createdObj, err = b.f.ClientSet.ResourceV1alpha2().ResourceClasses().Create(ctx, obj, metav1.CreateOptions{}) createdObj, err = b.f.ClientSet.ResourceV1alpha2().ResourceClasses().Create(ctx, obj, metav1.CreateOptions{})
case *v1.Pod: case *v1.Pod:
createdObj, err = b.f.ClientSet.CoreV1().Pods(b.f.Namespace.Name).Create(ctx, obj, metav1.CreateOptions{}) createdObj, err = b.f.ClientSet.CoreV1().Pods(b.f.Namespace.Name).Create(ctx, obj, metav1.CreateOptions{})
case *v1.ConfigMap: case *v1.ConfigMap:
_, err = b.f.ClientSet.CoreV1().ConfigMaps(b.f.Namespace.Name).Create(ctx, obj, metav1.CreateOptions{}) _, err = b.f.ClientSet.CoreV1().ConfigMaps(b.f.Namespace.Name).Create(ctx, obj, metav1.CreateOptions{})
case *resourcev1alpha2.ResourceClaim: case *resourcev1alpha2.ResourceClaim:
createdObj, err = b.f.ClientSet.ResourceV1alpha2().ResourceClaims(b.f.Namespace.Name).Create(ctx, obj, metav1.CreateOptions{}) createdObj, err = b.f.ClientSet.ResourceV1alpha2().ResourceClaims(b.f.Namespace.Name).Create(ctx, obj, metav1.CreateOptions{})
case *resourcev1alpha2.ResourceClaimTemplate: case *resourcev1alpha2.ResourceClaimTemplate:
createdObj, err = b.f.ClientSet.ResourceV1alpha2().ResourceClaimTemplates(b.f.Namespace.Name).Create(ctx, obj, metav1.CreateOptions{}) createdObj, err = b.f.ClientSet.ResourceV1alpha2().ResourceClaimTemplates(b.f.Namespace.Name).Create(ctx, obj, metav1.CreateOptions{})
default: default:
framework.Fail(fmt.Sprintf("internal error, unsupported type %T", obj), 1) framework.Fail(fmt.Sprintf("internal error, unsupported type %T", obj), 1)
} }
framework.ExpectNoErrorWithOffset(1, err, "create %T", obj) framework.ExpectNoErrorWithOffset(1, err, "create %T", obj)
createdObjs = append(createdObjs, createdObj) createdObjs = append(createdObjs, createdObj)
})
} }
return createdObjs return createdObjs
} }