lib/resourcebuilder/apiext: Centralize b.modifier(crd) call

[wking]

No need to repeat this for every version, which is how we've had things since 4ee7b07 (#259). Spun off from #400 at @smarterclayton's request.

[openshift-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: wking

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

• OWNERS [wking]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[openshift-ci-robot]

@wking: The following tests failed, say /retest to rerun all failed tests:

Test name	Commit	Details	Rerun command
ci/prow/unit	d9b2f0a	link	/test unit
ci/prow/images	d9b2f0a	link	/test images
ci/prow/e2e-aws	d9b2f0a	link	/test e2e-aws
ci/prow/e2e-aws-upgrade	d9b2f0a	link	/test e2e-aws-upgrade
ci/prow/integration	d9b2f0a	link	/test integration

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

[wking]

/close

Nevermind. Unit tests fail with:

# github.com/openshift/cluster-version-operator/lib/resourcebuilder [github.com/openshift/cluster-version-operator/lib/resourcebuilder.test]
lib/resourcebuilder/apiext.go:49:13: cannot use crd (type "k8s.io/apimachinery/pkg/runtime".Object) as type "k8s.io/apimachinery/pkg/apis/meta/v1".Object in argument to b.modifier:
	"k8s.io/apimachinery/pkg/runtime".Object does not implement "k8s.io/apimachinery/pkg/apis/meta/v1".Object (missing GetAnnotations method)

Because 4ee7b07 also replaced the structured:

func ReadCustomResourceDefinitionV1Beta1OrDie(objBytes []byte) *apiextv1beta1.CustomResourceDefinition {

with the less-structured:

func ReadCustomResourceDefinitionOrDie(objBytes []byte) runtime.Object {

We can maybe pivot to support for just the v1 CRD types, but that would be a different PR.

[openshift-ci-robot]

@wking: Closed this PR.

Details

In response to this:

/close

Nevermind. Unit tests fail with:

# github.com/openshift/cluster-version-operator/lib/resourcebuilder [github.com/openshift/cluster-version-operator/lib/resourcebuilder.test]
lib/resourcebuilder/apiext.go:49:13: cannot use crd (type "k8s.io/apimachinery/pkg/runtime".Object) as type "k8s.io/apimachinery/pkg/apis/meta/v1".Object in argument to b.modifier:
  "k8s.io/apimachinery/pkg/runtime".Object does not implement "k8s.io/apimachinery/pkg/apis/meta/v1".Object (missing GetAnnotations method)

Because 4ee7b07 also replaced the structured:

func ReadCustomResourceDefinitionV1Beta1OrDie(objBytes []byte) *apiextv1beta1.CustomResourceDefinition {

with the less-structured:

func ReadCustomResourceDefinitionOrDie(objBytes []byte) runtime.Object {

We can maybe pivot to support for just the v1 CRD types, but that would be a different PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.