From d9b2f0ad1fae354d82ab88dc39fb74c77487eb3f Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Tue, 7 Jul 2020 17:59:36 -0700 Subject: [PATCH] lib/resourcebuilder/apiext: Centralize b.modifier(crd) call No need to repeat this for every version, which is how we've had things since 4ee7b07e99 (Add apiextensions.k8s.io/v1 support for CRDs, 2019-10-22, #259). --- lib/resourcebuilder/apiext.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/resourcebuilder/apiext.go b/lib/resourcebuilder/apiext.go index 98f79bbf63..351ceef807 100644 --- a/lib/resourcebuilder/apiext.go +++ b/lib/resourcebuilder/apiext.go @@ -45,24 +45,22 @@ func (b *crdBuilder) WithModifier(f MetaV1ObjectModifierFunc) Interface { func (b *crdBuilder) Do(ctx context.Context) error { crd := resourceread.ReadCustomResourceDefinitionOrDie(b.raw) + if b.modifier != nil { + b.modifier(crd) + } + var updated bool var err error var name string switch crd := crd.(type) { case *apiextv1beta1.CustomResourceDefinition: - if b.modifier != nil { - b.modifier(crd) - } _, updated, err = resourceapply.ApplyCustomResourceDefinitionV1beta1(b.clientV1beta1, crd) if err != nil { return err } name = crd.Name case *apiextv1.CustomResourceDefinition: - if b.modifier != nil { - b.modifier(crd) - } _, updated, err = resourceapply.ApplyCustomResourceDefinitionV1(b.clientV1, crd) if err != nil { return err