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

Move to k8s 1.15 #803

Merged
merged 3 commits into from
Jul 25, 2019
Merged

Move to k8s 1.15 #803

merged 3 commits into from
Jul 25, 2019

Conversation

prameshj
Copy link
Contributor

In k8s 1.15, the cloudprovider code moved to k/k/staging and its own repo, k8s.io/legacy-cloud-providers.
So this PR includes the change to the new path for cloud provider gce dependency.

@bowei

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jul 24, 2019
@prameshj
Copy link
Contributor Author

Working on rebasing this.

@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 25, 2019
@prameshj prameshj force-pushed the k8s-1.15 branch 3 times, most recently from 4ed0402 to eec3a44 Compare July 25, 2019 17:48
@prameshj
Copy link
Contributor Author

/assign @bowei

@prameshj
Copy link
Contributor Author

/assign @spencerhance

@k8s-ci-robot
Copy link
Contributor

@prameshj: GitHub didn't allow me to assign the following users: spencerhance.

Note that only kubernetes members, repo collaborators and people who have commented on this issue/PR can be assigned. Additionally, issues/PRs can only have 10 assignees at the same time.
For more information please see the contributor guide

In response to this:

/assign @spencerhance

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.

@spencerhance
Copy link
Contributor

ack

spencerhance
spencerhance reviewed Jul 25, 2019
View reviewed changes
Copy link
Contributor

@spencerhance spencerhance left a comment

Choose a reason for hiding this comment

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

looks pretty good to me

pkg/backends/syncer.go Outdated
"k8s.io/api/core/v1"
"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta"
"k8s.io/legacy-cloud-providers/gce"

Copy link
Contributor

Choose a reason for hiding this comment

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

Do we need this space here?

pkg/healthchecks/healthchecks_test.go Outdated
"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud"
"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/mock"
"k8s.io/legacy-cloud-providers/gce"

Copy link
Contributor

Choose a reason for hiding this comment

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

Same here

go.mod
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20190620090010-a60497bb9ffa
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b
k8s.io/component-base => k8s.io/component-base v0.0.0-20190620085131-4cd66be69262
k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190531030430-6117653b35f1
Copy link
Contributor

Choose a reason for hiding this comment

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

it looks like a few of these dependencies are only listed in the replace block and not require. I didn't actually know that would work, but can you add them to the require block as well?

@prameshj
Move to kubernetes 1.15.
306f2a6 
The replace values were manually entered.Removed "require" section which
was re-populated by "go mod vendor"
@prameshj
Autogenerated vendor, go.mod, go.sum changes.
0f23bd5
@prameshj
Move to legacy-cloud-provider repo instead of k/k
f3b6aaa
@bowei
Copy link
Member

bowei commented Jul 25, 2019

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 25, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bowei, prameshj

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 25, 2019
@k8s-ci-robot k8s-ci-robot merged commit 0e67310 into kubernetes:master Jul 25, 2019
@prameshj prameshj deleted the k8s-1.15 branch October 9, 2019 22:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@spencerhance spencerhance spencerhance left review comments

@bowei bowei Awaiting requested review from bowei

@thockin thockin Awaiting requested review from thockin

Assignees

@bowei bowei

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. 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.
4 participants
@prameshj @k8s-ci-robot @spencerhance @bowei