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

deps: bump operator-registry version #3221

Merged
merged 2 commits into from
Jun 12, 2020

Conversation

estroz
Copy link
Member

@estroz estroz commented Jun 12, 2020

Description of the change:

  • deps: bump operator-registry
  • cmd/operator-sdk/bundle/validate,internal/scorecard/alpha/tests: the NewImageValidator API changed such that the command must create an image registry first before creating a validator.

Motivation for the change: This version of operator-registry contains a fix for a bug that causes validation errors when an existing annotations.yaml does not exactly match the default annotations generated by operator-sdk bundle create.

/cc @camilamacedo86 @jmrodri @hasbro17 @varshaprasad96

/kind bug

@openshift-ci-robot openshift-ci-robot added the kind/bug Categorizes issue or PR as related to a bug. label Jun 12, 2020
@estroz estroz force-pushed the chore/bump-operator-registry branch 2 times, most recently from 329ed3a to 083eb3f Compare June 12, 2020 01:47
@estroz estroz force-pushed the chore/bump-operator-registry branch from f462b9c to b34e85a Compare June 12, 2020 14:57
that causes validation errors when an existing `annotations.yaml`
does not exactly match the default annotations generated by
`operator-sdk bundle create`.

deps: bump operator-registry

cmd/operator-sdk/bundle,internal/scorecard/alpha/tests: the
`NewImageValidator` API changed such that the command must create
an image registry first before creating a validator.
@estroz estroz force-pushed the chore/bump-operator-registry branch from b34e85a to 24a4a96 Compare June 12, 2020 15:10
Copy link
Contributor

@camilamacedo86 camilamacedo86 left a comment

Choose a reason for hiding this comment

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

Just a few nits, see the comments over fix import order and suggestion for a description more user-friendly. And then, we can address the additionals concerns in #3222,

Otherwise,

/lgtm
/approve

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 12, 2020
@estroz estroz force-pushed the chore/bump-operator-registry branch from 24a4a96 to dd3232a Compare June 12, 2020 15:42
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Jun 12, 2020
- description: >
Fix bug in `operator-sdk bundle validation` that causes erroneous validation errors when the number of
annotations in an existing `annotations.yaml` does not equal the number of default bundle annotations
by upgrading the `operator-registry` dependency.
Copy link
Contributor

Choose a reason for hiding this comment

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

Loved 👍

Copy link
Contributor

Choose a reason for hiding this comment

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

Nit. The command should be operator-sdk bundle validate.

Copy link
Member

@jmrodri jmrodri left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 12, 2020
@estroz estroz merged commit 6e000a4 into operator-framework:master Jun 12, 2020
@estroz estroz deleted the chore/bump-operator-registry branch June 12, 2020 18:01
@estroz
Copy link
Member Author

estroz commented Jun 24, 2020

/cherry-pick v0.18.x

@openshift-cherrypick-robot

@estroz: failed to push cherry-picked changes in GitHub: pushing failed, output: "To https://github.com/operator-framework/operator-sdk\n ! [rejected] cherry-pick-3221-to-v0.18.x -> cherry-pick-3221-to-v0.18.x (non-fast-forward)\nerror: failed to push some refs to 'https://openshift-cherrypick-robot:CENSORED@github.com/operator-framework/operator-sdk'\nhint: Updates were rejected because the tip of your current branch is behind\nhint: its remote counterpart. Integrate the remote changes (e.g.\nhint: 'git pull ...') before pushing again.\nhint: See the 'Note about fast-forwards' in 'git push --help' for details.\n", error: exit status 1

In response to this:

/cherry-pick v0.18.x

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.

estroz pushed a commit to estroz/operator-sdk that referenced this pull request Jun 24, 2020
This version of operator-registry contains a fix for a bug
that causes validation errors when an existing `annotations.yaml`
does not exactly match the default annotations generated by
`operator-sdk bundle create`.

deps: bump operator-registry

cmd/operator-sdk/bundle,internal/scorecard/alpha/tests: the
`NewImageValidator` API changed such that the command must create
an image registry first before creating a validator.
estroz pushed a commit that referenced this pull request Jun 24, 2020
This version of operator-registry contains a fix for a bug
that causes validation errors when an existing `annotations.yaml`
does not exactly match the default annotations generated by
`operator-sdk bundle create`.

deps: bump operator-registry

cmd/operator-sdk/bundle,internal/scorecard/alpha/tests: the
`NewImageValidator` API changed such that the command must create
an image registry first before creating a validator.
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.

None yet

7 participants