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

go.mod: bump operator-registry to v1.14.3 for bundle validation improvements #3953

Merged

Conversation

joelanford
Copy link
Member

@joelanford joelanford commented Sep 28, 2020

Description of the change:
Bump operator-framework/operator-registry to v1.14.3.

Motivation for the change:
Resolves an issue with default channel bundle validation. The default channel label is not required.

Checklist

If the pull request includes user-facing changes, extra documentation is required:

Copy link
Member

@dinhxuanvu dinhxuanvu 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 Sep 28, 2020
@joelanford
Copy link
Member Author

/hold

Need one more fix from operator-registry to get this to pass CI.

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 28, 2020
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Sep 29, 2020
@joelanford joelanford changed the title go.mod: bump operator-registry to v1.14.2 for bundle validation improvements go.mod: bump operator-registry to v1.14.3 for bundle validation improvements Sep 29, 2020
@joelanford
Copy link
Member Author

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 29, 2020
@jmrodri
Copy link
Member

jmrodri commented Sep 29, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 29, 2020
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

@joelanford joelanford merged commit 38ed726 into operator-framework:master Sep 29, 2020
@joelanford joelanford deleted the bump-operator-registry branch September 29, 2020 17:48
@joelanford
Copy link
Member Author

/cherry-pick v1.0.x

@openshift-cherrypick-robot

@joelanford: new pull request created: #3959

In response to this:

/cherry-pick v1.0.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.

@joelanford
Copy link
Member Author

/cherry-pick v0.19.x

@openshift-cherrypick-robot

@joelanford: #3953 failed to apply on top of branch "v0.19.x":

Applying: go.mod: bump operator-registry to v1.14.3 for bundle validation improvements
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
Falling back to patching base and 3-way merge...
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 go.mod: bump operator-registry to v1.14.3 for bundle validation improvements
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick v0.19.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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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

5 participants