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

Revendor against tip of k8s.io/kubernetes to prepare for 1.16 release of CA #2305

Merged
merged 8 commits into from
Sep 6, 2019

Conversation

losipiuk
Copy link
Contributor

@losipiuk losipiuk commented Sep 5, 2019

Note: This pr uses old version of revendoring. The process will change slightly with #2286 merged

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Sep 5, 2019
@krzysztof-jastrzebski
Copy link
Contributor

/lgtm
/approve

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: krzysztof-jastrzebski

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 Sep 5, 2019
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 5, 2019
@micahhausler
Copy link
Member

@losipiuk this is going to cause quite a merge conflict with #2286, what do you think about holding off until that is merged?

@losipiuk
Copy link
Contributor Author

losipiuk commented Sep 5, 2019

Łukasz Osipiuk this is going to cause quite a merge conflict with #2286, what do you think about holding off until that is merged?

I would prefer to have it merged first. We need revendoring for sake of building release for k8s 1.16 which is in freeze already. IMO introducing new process just before cutting new release adds unnecessary risk. #2286 should be easy to rebase just bu rerunning script you prepared there. Right?

@micahhausler
Copy link
Member

The rebase won't be simple, because my PR also moves the digitalocean cloudprovider out into /vendor, and this change modifies that and other dependencies.

The risk should be really minimal, as re-running my change against the previous k8s commit (relative to this PR) resulted in no changes

@micahhausler
Copy link
Member

There seems to be an issue with go mod vendor and go mod tidy on commits that have a tag, but not on untagged commits. We'll skip using my PR for now until we resolve that go mod issue

@losipiuk
Copy link
Contributor Author

losipiuk commented Sep 5, 2019

Updated this PR to include bumping github.com/aws/aws-sdk-go to v1.23.12 as discussed with @micahhausler.
@Jeffwan PTAL.

@krzysztof-jastrzebski
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 6, 2019
@k8s-ci-robot k8s-ci-robot merged commit 61c4ced into kubernetes:master Sep 6, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

4 participants