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

Spotinst: Support for Headroom, Taints and Subnets in Ocean Launch Spec and User Data fixes #8294

Merged
merged 2 commits into from
Apr 19, 2020
Merged

Spotinst: Support for Headroom, Taints and Subnets in Ocean Launch Spec and User Data fixes #8294

merged 2 commits into from
Apr 19, 2020

Conversation

liranp
Copy link
Contributor

@liranp liranp commented Jan 9, 2020 •
edited
Loading

This PR adds support for Headroom, Taints and Subnets in Ocean Launch Spec and minor User Data fixes.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jan 9, 2020
@k8s-ci-robot
Copy link
Contributor

Hi @liranp. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jan 9, 2020
@joshbranham
Copy link
Contributor

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jan 10, 2020
@joshbranham
Copy link
Contributor

@liranp would you mind splitting the commits up a bit? This is a pretty large change (vendoring makes sense) but usually vendored code a standalone commit is easier for reviewers

@liranp liranp force-pushed the feature-spotinst-launchspec branch from bb016ca to 056ed17 Compare January 12, 2020 11:31
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 12, 2020
@liranp liranp force-pushed the feature-spotinst-launchspec branch from 056ed17 to f2aceb2 Compare January 12, 2020 11:40
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 12, 2020
@liranp
Copy link
Contributor Author

liranp commented Jan 12, 2020

@joshbranham Done. Please let me know if you want me to split more. Thanks for reviewing this!

@liranp liranp force-pushed the feature-spotinst-launchspec branch from f2aceb2 to ea9ba8d Compare January 18, 2020 17:24
@liranp liranp changed the title Spotinst: Support for Taints and Subnets in Ocean Launch Spec [WIP] Spotinst: Support for Taints and Subnets in Ocean Launch Spec Jan 21, 2020
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 21, 2020
@liranp liranp force-pushed the feature-spotinst-launchspec branch from ea9ba8d to f8f284c Compare January 22, 2020 12:04
@liranp liranp changed the title [WIP] Spotinst: Support for Taints and Subnets in Ocean Launch Spec Spotinst: Support for Headroom, Taints and Subnets in Ocean Launch Spec Jan 22, 2020
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 22, 2020
@liranp liranp force-pushed the feature-spotinst-launchspec branch from f8f284c to b800c38 Compare January 28, 2020 15:25
@liranp liranp changed the title Spotinst: Support for Headroom, Taints and Subnets in Ocean Launch Spec Spotinst: Support for Headroom, Taints and Subnets in Ocean Launch Spec and User Data fixes Jan 29, 2020
@liranp liranp force-pushed the feature-spotinst-launchspec branch 2 times, most recently from 63d988e to 490930d Compare February 2, 2020 10:18
@liranp liranp force-pushed the feature-spotinst-launchspec branch 3 times, most recently from 84d5e0c to c9d78e9 Compare February 10, 2020 21:06
@liranp liranp mentioned this pull request Feb 12, 2020
Merged
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 15, 2020
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Feb 23, 2020
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 25, 2020
@liranp
Copy link
Contributor Author

liranp commented Feb 25, 2020

/test pull-kops-e2e-kubernetes-aws

rifelpet
rifelpet reviewed Feb 26, 2020
View reviewed changes
go.mod Outdated
@@ -139,6 +139,7 @@ require (
k8s.io/helm v2.9.0+incompatible
k8s.io/klog v1.0.0
k8s.io/kubectl v0.0.0
k8s.io/kubernetes v1.17.3
Copy link
Member

Choose a reason for hiding this comment

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

We've been working towards dropping k8s.io/kubernetes as a dependency (example: #8055 and #8056) since it can be a nightmare to update with each minor version and all of the transitive dependencies.

Seeing as you're only using the ParseTaints function and there doesn't appear to be any effort to move it to one of the other k8s.io repos, maybe we consider copying the function directly into the kops repo? It looks like ParseTaints and two unexported functions might be all that is needed.

@justinsb what do you think? You can also provide more context on shifting away from depending on k/k.

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've removed the k8s.io/kubernetes dependency and extracted the relevant parts only.

@liranp liranp force-pushed the feature-spotinst-launchspec branch 4 times, most recently from debd1de to 4244bb8 Compare March 19, 2020 20:56
@liranp liranp force-pushed the feature-spotinst-launchspec branch from 4244bb8 to 7b796cd Compare March 31, 2020 21:45
@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Mar 31, 2020
@liranp liranp force-pushed the feature-spotinst-launchspec branch from a8bb7eb to a0ec9ee Compare April 19, 2020 11:09
@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Apr 19, 2020
@liranp liranp force-pushed the feature-spotinst-launchspec branch from a0ec9ee to 2a17a50 Compare April 19, 2020 11:23
@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 19, 2020
@rifelpet
Copy link
Member

/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 Apr 19, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: liranp, rifelpet

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 merged commit 06fda7f into kubernetes:master Apr 19, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.18 milestone Apr 19, 2020
@liranp liranp deleted the feature-spotinst-launchspec branch April 19, 2020 12:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rifelpet rifelpet rifelpet left review comments

@joshbranham joshbranham Awaiting requested review from joshbranham

@robinpercy robinpercy Awaiting requested review from robinpercy

Assignees

@rifelpet rifelpet

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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
v1.18
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@liranp @k8s-ci-robot @joshbranham @rifelpet