Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

validation: bundle CRDs are compared by definition key instead of name (#32) #39

Merged

Conversation

estroz
Copy link
Member

@estroz estroz commented Jun 2, 2020

#32 was reverted at some point. This PR fixes the reversion, considering both v1 and v1beta1 CRDs.

/cc @dinhxuanvu @kevinrizza @gallettilance

/kind bug

description: "registryv1 invalid bundle with duplicate CRD etcdclusters in bundle",
directory: "./testdata/invalid_bundle_3",
hasError: true,
errString: `duplicate CRD key "tests.test.example.com/v1alpha1" in bundle "test-operator.v0.0.1"`,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

if err != (errors.Error{}) {
result.Add(err)
return result
ownedKeys := getOwnedCustomResourceDefintionKeys(csv)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know it's outside the scope of this pr, but my nit for this would be that this function header has too many arguments if there's a pointer to the csv in the bundle anyway.

pkg/validation/interfaces/validator.go Outdated Show resolved Hide resolved
@kevinrizza
Copy link
Member

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 2, 2020
@kevinrizza kevinrizza merged commit 431198d into operator-framework:master Jun 2, 2020
estroz added a commit to estroz/operator-registry that referenced this pull request Jun 4, 2020
operator-framework/api#39. This update also
removes the bou.ke/monkey dependency that has a very restrictive license.
ankitathomas pushed a commit to ankitathomas/operator-framework-olm that referenced this pull request Apr 6, 2021
operator-framework/api#39. This update also
removes the bou.ke/monkey dependency that has a very restrictive license.

(upstream operator-registry commit: d73a908162177fafd045277cf4a90f5770a01de0)
openshift-merge-robot pushed a commit to openshift/operator-framework-olm that referenced this pull request Jul 14, 2021
operator-framework/api#39. This update also
removes the bou.ke/monkey dependency that has a very restrictive license.

Upstream-repository: operator-registry
Upstream-commit: d73a908162177fafd045277cf4a90f5770a01de0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants