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

Use downstream triple package #2910

Merged
merged 1 commit into from
Mar 4, 2019
Merged

Use downstream triple package #2910

merged 1 commit into from
Mar 4, 2019

Conversation

alvaroaleman
Copy link
Contributor

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

What this PR does / why we need it:

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:

Documentation:

Release note:

none

@alvaroaleman
Use downstream triple package
4cf7cae 
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
@kubermatic-bot kubermatic-bot added release-note-none Denotes a PR that doesn't merit a release note. team/lifecycle size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 3, 2019
@alvaroaleman
Copy link
Contributor Author

/cherrypick release/v2.9

@kubermatic-bot
Copy link
Contributor

@alvaroaleman: once the present PR merges, I will cherry-pick it on top of release/v2.9 in a new PR and assign it to you.

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

/retest

@alvaroaleman
Copy link
Contributor Author

/assign @mrIncompetent

@alvaroaleman alvaroaleman mentioned this pull request Mar 3, 2019
Merged
@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: 1cb1a538d6f38750c3fc9c37fa070bcdcb5af9b3

@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
@kubermatic-bot kubermatic-bot merged commit f479adc into master Mar 4, 2019
@kubermatic-bot kubermatic-bot deleted the triple-downstream branch March 4, 2019 08:30
@kubermatic-bot
Copy link
Contributor

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

Using index info to reconstruct a base tree...
M	api/Gopkg.lock
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/resources.go
Auto-merging api/pkg/resources/machinecontroller/webhook.go
Auto-merging api/pkg/resources/kubeconfig_test.go
Auto-merging api/pkg/resources/kubeconfig.go
CONFLICT (content): Merge conflict in api/pkg/resources/kubeconfig.go
Auto-merging api/pkg/resources/data.go
Auto-merging api/pkg/resources/certificates/triple/triple.go
Auto-merging api/pkg/resources/certificates/root-ca.go
Auto-merging api/pkg/resources/certificates/client-certificate.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.
Auto-merging api/pkg/controller/backup/backup_controller.go
Auto-merging api/Gopkg.lock
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
Use downstream triple package (#2910)
1899920 
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
kubermatic-bot pushed a commit that referenced this pull request Mar 4, 2019
@alvaroaleman @kubermatic-bot
[release/v2.9] Add downstream triple (#2913)
6212798 
* Use downstream triple package (#2910)

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

* Remove test occurence of the upstream triple package
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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

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