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

[v0.19.x] deps: fix upstream JSON patch issues (#3936) #3940

Merged
merged 2 commits into from
Sep 26, 2020

Conversation

estroz
Copy link
Member

@estroz estroz commented Sep 24, 2020

Cherry pick #3936

@estroz
Copy link
Member Author

estroz commented Sep 24, 2020

/cc @meyskens

@openshift-ci-robot
Copy link

@estroz: GitHub didn't allow me to request PR reviews from the following users: meyskens.

Note that only operator-framework members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

/cc @meyskens

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
Copy link
Member Author

estroz commented Sep 24, 2020

This needs a changelog as well. Going to get one merged in master then add it to this cherry-pick.

/hold

@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 24, 2020
*: bump k8s versions to v1.18.8 and helm to v3.3.4

Signed-off-by: Maartje Eyskens <maartje@eyskens.me>
@estroz
Copy link
Member Author

estroz commented Sep 25, 2020

/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 25, 2020
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.

/approve
/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 25, 2020
@estroz estroz merged commit 861d2f2 into operator-framework:v0.19.x Sep 26, 2020
@estroz estroz deleted the cherrypick/3936 branch September 26, 2020 16:40
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

4 participants