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

Update client-go to 1.13.1 #2911

Merged
merged 6 commits into from
Mar 4, 2019
Merged

Update client-go to 1.13.1 #2911

merged 6 commits into from
Mar 4, 2019

Conversation

alvaroaleman
Copy link
Contributor

What this PR does / why we need it:

  • Updates client-go to 1.13.1
  • Updates controller-runtime to v0.1.10

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

This is based on top of #2910 so that one should go in first
Documentation:

Release note:

none

@alvaroaleman
Use downstream triple package
bdfaab6 
Upstream removed the triple package[0], in order to be able to upgrade
client-go we need to have a downsream version.

[0] kubernetes/kubernetes#70966
@alvaroaleman
WIP
d2c3390
@alvaroaleman
Update fixtures
2b443a1
@alvaroaleman
Override cluster-api dependency
72a7564
@alvaroaleman
Fix linting
4268f9a
@kubermatic-bot kubermatic-bot added release-note-none Denotes a PR that doesn't merit a release note. team/lifecycle size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Mar 3, 2019
alvaroaleman
alvaroaleman commented Mar 3, 2019
View reviewed changes
api/Gopkg.toml
@@ -22,6 +22,13 @@ required = [
non-go = false
unused-packages = false


# TODO @alvaroaleman: This was needed so the typed fake clientset stays compatible with our client-go
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have a pull locally that does this. Unfortunatelly it requires this pull because it needs a newer version of controller-runtimes fake client which in turn needs a newer version of client-go.

Since it changes quite some bits in the api I want it to be a distinct PR.

@alvaroaleman
Copy link
Contributor Author

/retest

/hold

Until #2910 merges

@kubermatic-bot kubermatic-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 3, 2019
@alvaroaleman
Copy link
Contributor Author

/hold cancel
/cherry-pick release/v2.9

Cherrypicking so we dont have to maintain a machine-controller release branch

@kubermatic-bot kubermatic-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 4, 2019
@alvaroaleman
Copy link
Contributor Author

/assign @mrIncompetent

@alvaroaleman
Copy link
Contributor Author

/retest

@mrIncompetent
Copy link
Contributor

/lgtm
/approve

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Mar 4, 2019
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: c77f4dcbadc7e9fb6686a95aa9b9b7359cba8692

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mrIncompetent

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubermatic-bot kubermatic-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 4, 2019
@alvaroaleman
Copy link
Contributor Author

/retest

@kubermatic-bot kubermatic-bot merged commit 33e7bef into master Mar 4, 2019
@kubermatic-bot kubermatic-bot deleted the kube-1.13 branch March 4, 2019 10:14
@alvaroaleman
Copy link
Contributor Author

/cherrypick release/v2.9

@kubermatic-bot
Copy link
Contributor

@alvaroaleman: #2911 failed to apply on top of branch "release/v2.9":

Using index info to reconstruct a base tree...
M	api/pkg/controller/backup/backup_controller.go
A	api/pkg/controller/openshift/data.go
A	api/pkg/controller/openshift/resources/interfaces.go
A	api/pkg/controller/openshift/resources/loopback_kubeconfig.go
M	api/pkg/resources/certificates/client-certificate.go
M	api/pkg/resources/certificates/root-ca.go
M	api/pkg/resources/data.go
M	api/pkg/resources/kubeconfig.go
M	api/pkg/resources/kubeconfig_test.go
M	api/pkg/resources/machinecontroller/webhook.go
M	api/pkg/resources/resources.go
Falling back to patching base and 3-way merge...
Auto-merging api/pkg/resources/kubeconfig.go
CONFLICT (content): Merge conflict in api/pkg/resources/kubeconfig.go
CONFLICT (modify/delete): api/pkg/controller/openshift/resources/loopback_kubeconfig.go deleted in HEAD and modified in Use downstream triple package. Version Use downstream triple package of api/pkg/controller/openshift/resources/loopback_kubeconfig.go left in tree.
CONFLICT (modify/delete): api/pkg/controller/openshift/resources/interfaces.go deleted in HEAD and modified in Use downstream triple package. Version Use downstream triple package of api/pkg/controller/openshift/resources/interfaces.go left in tree.
CONFLICT (modify/delete): api/pkg/controller/openshift/data.go deleted in HEAD and modified in Use downstream triple package. Version Use downstream triple package of api/pkg/controller/openshift/data.go left in tree.
error: Failed to merge in the changes.
Patch failed at 0001 Use downstream triple package

In response to this:

/cherrypick release/v2.9

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.

alvaroaleman added a commit that referenced this pull request Mar 4, 2019
@alvaroaleman
Update client-go to 1.13.1 (#2911)
b7660b0 
* Use downstream triple package

Upstream removed the triple package[0], in order to be able to upgrade
client-go we need to have a downsream version.

[0] kubernetes/kubernetes#70966

* WIP

* Update fixtures

* Override cluster-api dependency

* Fix linting
kubermatic-bot pushed a commit that referenced this pull request Mar 4, 2019
@alvaroaleman @kubermatic-bot
[release/v2.9] Update client-go to 1.13.1 (#2911) (#2915)
7825f6c 
* Update client-go to 1.13.1 (#2911)

* Use downstream triple package

Upstream removed the triple package[0], in order to be able to upgrade
client-go we need to have a downsream version.

[0] kubernetes/kubernetes#70966

* WIP

* Update fixtures

* Override cluster-api dependency

* Fix linting

* Explicitly add errors package

* Remove explicit dependency declaration
@xrstf xrstf mentioned this pull request Aug 14, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@alvaroaleman @mrIncompetent @kubermatic-bot