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.

Sign up for GitHub

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

Jump to bottom

deps: fix upstream JSON patch issues #3936

Merged
merged 1 commit into from
Sep 24, 2020
Merged

deps: fix upstream JSON patch issues #3936

merged 1 commit into from
Sep 24, 2020

Conversation

meyskens
Copy link
Contributor

Description of the change:

Bumps the Helm version as well as the underlying Kubernetes version.

Motivation for the change:
Adding a fix for helm/helm#8594 which is a fix for kubernetes/kubernetes#91615 which causes complex CRD updates to hang,

Checklist

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

@meyskens meyskens mentioned this pull request Sep 24, 2020
Closed
@estroz
Copy link
Member

estroz commented Sep 24, 2020

/cc @bharathi-tenneti @joelanford

@estroz
Copy link
Member

estroz commented Sep 24, 2020

@meyskens can you run make tidy then push? Thanks.

@meyskens
Fix upstream JSON patch issues
31ddc27 
Signed-off-by: Maartje Eyskens <[email protected]>
@meyskens
Copy link
Contributor Author

@estroz done!

joelanford
joelanford approved these changes Sep 24, 2020
View reviewed changes
Copy link
Member

@joelanford joelanford left a comment

Choose a reason for hiding this comment

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

Thanks @meyskens

/lgtm

Once this passes/merges, I think we should backport it to v1.0.x and v0.19.x

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 24, 2020
estroz
estroz approved these changes Sep 24, 2020
View reviewed changes
Copy link
Member

@estroz estroz left a comment

Choose a reason for hiding this comment

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

Helm 3.2.x and 3.3.x both support the same k8s version range, and there are no breaking changes afaict.

/lgtm

@estroz estroz changed the title Fix upstream JSON patch issues deps: fix upstream JSON patch issues Sep 24, 2020
@estroz estroz merged commit 8759f01 into operator-framework:master Sep 24, 2020
@estroz
Copy link
Member

estroz commented Sep 24, 2020 •
edited
Loading

/cherry-pick v1.0.x

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Sep 24, 2020
Merged
@openshift-cherrypick-robot
Copy link

@estroz: new pull request created: #3938

In response to this:

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

@estroz
Copy link
Member

estroz commented Sep 24, 2020

/cherry-pick v0.19.x

@openshift-cherrypick-robot
Copy link

@estroz: #3936 failed to apply on top of branch "v0.19.x":

Applying: Fix upstream JSON patch issues
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 Fix upstream JSON patch issues
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.

estroz pushed a commit to estroz/operator-sdk that referenced this pull request Sep 24, 2020
@meyskens @estroz
deps: fix upstream JSON patch issues (operator-framework#3936)
0305c09 
go.mod,go.sum: bump k8s versions to v1.18.8 and helm to v3.3.4

Signed-off-by: Maartje Eyskens <[email protected]>
@estroz estroz mentioned this pull request Sep 24, 2020
Merged
estroz pushed a commit to estroz/operator-sdk that referenced this pull request Sep 24, 2020
@meyskens @estroz
deps: fix upstream JSON patch issues (operator-framework#3936)
8cbda62 
*: bump k8s versions to v1.18.8 and helm to v3.3.4

Signed-off-by: Maartje Eyskens <[email protected]>
@estroz estroz mentioned this pull request Sep 24, 2020
Merged
2 tasks
estroz pushed a commit that referenced this pull request Sep 26, 2020
@meyskens
deps: fix upstream JSON patch issues (#3936) (#3940)
861d2f2 
*: bump k8s versions to v1.18.8 and helm to v3.3.4

Signed-off-by: Maartje Eyskens <[email protected]>

Co-authored-by: Maartje Eyskens <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joelanford joelanford joelanford approved these changes

@estroz estroz estroz approved these changes

@rashmigottipati rashmigottipati Awaiting requested review from rashmigottipati

@bharathi-tenneti bharathi-tenneti Awaiting requested review from bharathi-tenneti

Assignees

@joelanford joelanford

@estroz estroz

Labels
lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@meyskens @estroz @openshift-cherrypick-robot @joelanford @openshift-ci-robot