Skip to content

Add k3s as an available option. Change Rancher 2.0 to Rancher#13733

Merged
k8s-ci-robot merged 7 commits intokubernetes:masterfrom
JasonvanBrackel:master
Apr 19, 2019
Merged

Add k3s as an available option. Change Rancher 2.0 to Rancher#13733
k8s-ci-robot merged 7 commits intokubernetes:masterfrom
JasonvanBrackel:master

Conversation

@JasonvanBrackel
Copy link
Copy Markdown
Contributor

@JasonvanBrackel JasonvanBrackel commented Apr 9, 2019

Added k3s as a viable Kubernetes option. Removed 2.0 from the Rancher mentions as we're simply referring to it as Rancher.

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Apr 9, 2019

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://git.k8s.io/community/CLA.md#the-contributor-license-agreement to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.

Details

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. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. language/en Issues or PRs related to English language sig/docs Categorizes an issue or PR as relevant to SIG Docs. labels Apr 9, 2019
@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Apr 9, 2019
@netlify
Copy link
Copy Markdown

netlify bot commented Apr 9, 2019 •
edited
Loading

Deploy preview for kubernetes-io-master-staging ready!

Built with commit a42f81c

https://deploy-preview-13733--kubernetes-io-master-staging.netlify.com

@JasonvanBrackel
Copy link
Copy Markdown
Contributor Author

JasonvanBrackel commented Apr 9, 2019

Realized I did a couple commits from a clean ubuntu VM, they are mine.

@JasonvanBrackel
Copy link
Copy Markdown
Contributor Author

JasonvanBrackel commented Apr 9, 2019

I should be CLA signed I'm hoping it's flagging me simply because of the commit problem.

@JasonvanBrackel JasonvanBrackel changed the title Add k3s as an available option. Chnage Rancher 2.0 to Rancher Add k3s as an available option. Change Rancher 2.0 to Rancher Apr 9, 2019
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Apr 11, 2019
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 11, 2019
@DanyC97
Copy link
Copy Markdown
Contributor

DanyC97 commented Apr 15, 2019

@JasonvanBrackel thank you for the PR, you mind fixing the conflict please?

sftim
sftim reviewed Apr 15, 2019
View reviewed changes
Tim Bannister and others added 2 commits April 15, 2019 12:37
@DanyC97
Copy link
Copy Markdown
Contributor

DanyC97 commented Apr 16, 2019

thanks @sftim @JasonvanBrackel .
/lgtm

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

Bradamant3 commented Apr 19, 2019

/approve

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Apr 19, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Bradamant3

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

The pull request process is described here

Details 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 Apr 19, 2019
@k8s-ci-robot k8s-ci-robot merged commit 8ead671 into kubernetes:master Apr 19, 2019
@MiloATH MiloATH mentioned this pull request Apr 21, 2019
Merged
@k8s-ci-robot k8s-ci-robot mentioned this pull request Apr 26, 2019
Closed
@k8s-ci-robot k8s-ci-robot mentioned this pull request May 9, 2019
Closed
nowjean pushed a commit to nowjean/website that referenced this pull request Jun 13, 2019
@JasonvanBrackel @nowjean
Add k3s as an available option. Change Rancher 2.0 to Rancher (kubern…
40337e9 
…etes#13733)

* Adding k3s information

* Adding k3s information

* Add K3s information.

* Change Rancher 2.0 to Rancher

* Update content/en/docs/setup/pick-right-solution.md per suggestion by @sftim

Co-Authored-By: JasonvanBrackel <jason@vanbrackel.net>
@k8s-ci-robot k8s-ci-robot mentioned this pull request Jun 13, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@brendandburns brendandburns Awaiting requested review from brendandburns

@mikedanese mikedanese Awaiting requested review from mikedanese

1 more reviewer

@sftim sftim sftim left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@DanyC97 DanyC97

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. language/en Issues or PRs related to English language lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/docs Categorizes an issue or PR as relevant to SIG Docs. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@JasonvanBrackel @k8s-ci-robot @DanyC97 @Bradamant3 @sftim