From 945878d0722ab3fa4a8626dfed549aab59d35feb Mon Sep 17 00:00:00 2001 From: Denis Kolodin Date: Sun, 16 Oct 2016 12:23:27 +0300 Subject: [PATCH 01/30] Separate docker's args --- docs/hellonode.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/hellonode.md b/docs/hellonode.md index 602a383a5b..0392dc994b 100755 --- a/docs/hellonode.md +++ b/docs/hellonode.md @@ -145,7 +145,7 @@ docker stop hello_tutorial Now that the image works as intended and is all tagged with your `$PROJECT_ID`, we can push it to the [Google Container Registry](https://cloud.google.com/tools/container-registry/), a private repository for your Docker images accessible from every Google Cloud project (but also from outside Google Cloud Platform) : ```shell -gcloud docker push gcr.io/$PROJECT_ID/hello-node:v1 +gcloud docker -- push gcr.io/$PROJECT_ID/hello-node:v1 ``` If all goes well, you should be able to see the container image listed in the console: *Compute > Container Engine > Container Registry*. We now have a project-wide Docker image available which Kubernetes can access and orchestrate. @@ -336,7 +336,7 @@ We can now build and publish a new container image to the registry with an incre ```shell docker build -t gcr.io/$PROJECT_ID/hello-node:v2 . -gcloud docker push gcr.io/$PROJECT_ID/hello-node:v2 +gcloud docker -- push gcr.io/$PROJECT_ID/hello-node:v2 ``` Building and pushing this updated image should be much quicker as we take full advantage of the Docker cache. From e3cd4eb67cd93a7b885288601eddcb560b2d2e49 Mon Sep 17 00:00:00 2001 From: Justin Garrison Date: Thu, 17 Nov 2016 21:18:50 -0800 Subject: [PATCH 02/30] added command to download kubectl via curl --- docs/user-guide/prereqs.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/docs/user-guide/prereqs.md b/docs/user-guide/prereqs.md index e6b94baa62..ccaacb7db8 100644 --- a/docs/user-guide/prereqs.md +++ b/docs/user-guide/prereqs.md @@ -13,6 +13,15 @@ If you downloaded a pre-compiled [release](https://github.com/kubernetes/kuberne If you built from source, kubectl should be either under `_output/local/bin//` or `_output/dockerized/bin//`. +If you don't have the source code checked out you can download the compiled kubectl binary for each release with curl + +```shell +# Linux +curl -LO https://storage.googleapis.com/kubernetes-release/release/${K8S_VERSION}/bin/linux/amd64/kubectl +# OS X +curl -LO https://storage.googleapis.com/kubernetes-release/release/${K8S_VERSION}/bin/darwin/amd64/kubectl +``` + The kubectl binary doesn't have to be installed to be executable, but the rest of the walkthrough will assume that it's in your PATH. The simplest way to install is to copy or move kubectl into a dir already in PATH (e.g. `/usr/local/bin`). For example: @@ -57,4 +66,4 @@ If you see a url response, you are ready to go. ## What's next? -[Learn how to launch and expose your application.](/docs/user-guide/quick-start) \ No newline at end of file +[Learn how to launch and expose your application.](/docs/user-guide/quick-start) From 54cd5d115b9de76dbb82dedb8f36615ecff64a81 Mon Sep 17 00:00:00 2001 From: craigbox Date: Tue, 22 Nov 2016 13:02:02 +0000 Subject: [PATCH 03/30] Update LICENSE to CC BY SA 4.0 Text copied from https://creativecommons.org/licenses/by/4.0/legalcode.txt. --- LICENSE | 532 ++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 363 insertions(+), 169 deletions(-) diff --git a/LICENSE b/LICENSE index 5ee2946660..06c608dcf4 100644 --- a/LICENSE +++ b/LICENSE @@ -1,201 +1,395 @@ -Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ +Attribution 4.0 International - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION +======================================================================= - 1. Definitions. +Creative Commons Corporation ("Creative Commons") is not a law firm and +does not provide legal services or legal advice. Distribution of +Creative Commons public licenses does not create a lawyer-client or +other relationship. Creative Commons makes its licenses and related +information available on an "as-is" basis. Creative Commons gives no +warranties regarding its licenses, any material licensed under their +terms and conditions, or any related information. Creative Commons +disclaims all liability for damages resulting from their use to the +fullest extent possible. - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. +Using Creative Commons Public Licenses - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. +Creative Commons public licenses provide a standard set of terms and +conditions that creators and other rights holders may use to share +original works of authorship and other material subject to copyright +and certain other rights specified in the public license below. The +following considerations are for informational purposes only, are not +exhaustive, and do not form part of our licenses. - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. + Considerations for licensors: Our public licenses are + intended for use by those authorized to give the public + permission to use material in ways otherwise restricted by + copyright and certain other rights. Our licenses are + irrevocable. Licensors should read and understand the terms + and conditions of the license they choose before applying it. + Licensors should also secure all rights necessary before + applying our licenses so that the public can reuse the + material as expected. Licensors should clearly mark any + material not subject to the license. This includes other CC- + licensed material, or material used under an exception or + limitation to copyright. More considerations for licensors: + wiki.creativecommons.org/Considerations_for_licensors - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. + Considerations for the public: By using one of our public + licenses, a licensor grants the public permission to use the + licensed material under specified terms and conditions. If + the licensor's permission is not necessary for any reason--for + example, because of any applicable exception or limitation to + copyright--then that use is not regulated by the license. Our + licenses grant only permissions under copyright and certain + other rights that a licensor has authority to grant. Use of + the licensed material may still be restricted for other + reasons, including because others have copyright or other + rights in the material. A licensor may make special requests, + such as asking that all changes be marked or described. + Although not required by our licenses, you are encouraged to + respect those requests where reasonable. More_considerations + for the public: + wiki.creativecommons.org/Considerations_for_licensees - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. +======================================================================= - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. +Creative Commons Attribution 4.0 International Public License - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). +By exercising the Licensed Rights (defined below), You accept and agree +to be bound by the terms and conditions of this Creative Commons +Attribution 4.0 International Public License ("Public License"). To the +extent this Public License may be interpreted as a contract, You are +granted the Licensed Rights in consideration of Your acceptance of +these terms and conditions, and the Licensor grants You such rights in +consideration of benefits the Licensor receives from making the +Licensed Material available under these terms and conditions. - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." +Section 1 -- Definitions. - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. + a. Adapted Material means material subject to Copyright and Similar + Rights that is derived from or based upon the Licensed Material + and in which the Licensed Material is translated, altered, + arranged, transformed, or otherwise modified in a manner requiring + permission under the Copyright and Similar Rights held by the + Licensor. For purposes of this Public License, where the Licensed + Material is a musical work, performance, or sound recording, + Adapted Material is always produced where the Licensed Material is + synched in timed relation with a moving image. - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. + b. Adapter's License means the license You apply to Your Copyright + and Similar Rights in Your contributions to Adapted Material in + accordance with the terms and conditions of this Public License. - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. + c. Copyright and Similar Rights means copyright and/or similar rights + closely related to copyright including, without limitation, + performance, broadcast, sound recording, and Sui Generis Database + Rights, without regard to how the rights are labeled or + categorized. For purposes of this Public License, the rights + specified in Section 2(b)(1)-(2) are not Copyright and Similar + Rights. - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: + d. Effective Technological Measures means those measures that, in the + absence of proper authority, may not be circumvented under laws + fulfilling obligations under Article 11 of the WIPO Copyright + Treaty adopted on December 20, 1996, and/or similar international + agreements. - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and + e. Exceptions and Limitations means fair use, fair dealing, and/or + any other exception or limitation to Copyright and Similar Rights + that applies to Your use of the Licensed Material. - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and + f. Licensed Material means the artistic or literary work, database, + or other material to which the Licensor applied this Public + License. - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and + g. Licensed Rights means the rights granted to You subject to the + terms and conditions of this Public License, which are limited to + all Copyright and Similar Rights that apply to Your use of the + Licensed Material and that the Licensor has authority to license. - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. + h. Licensor means the individual(s) or entity(ies) granting rights + under this Public License. - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. + i. Share means to provide material to the public by any means or + process that requires permission under the Licensed Rights, such + as reproduction, public display, public performance, distribution, + dissemination, communication, or importation, and to make material + available to the public including in ways that members of the + public may access the material from a place and at a time + individually chosen by them. - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. + j. Sui Generis Database Rights means rights other than copyright + resulting from Directive 96/9/EC of the European Parliament and of + the Council of 11 March 1996 on the legal protection of databases, + as amended and/or succeeded, as well as other essentially + equivalent rights anywhere in the world. - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. + k. You means the individual or entity exercising the Licensed Rights + under this Public License. Your has a corresponding meaning. - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. +Section 2 -- Scope. - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. + a. License grant. - END OF TERMS AND CONDITIONS + 1. Subject to the terms and conditions of this Public License, + the Licensor hereby grants You a worldwide, royalty-free, + non-sublicensable, non-exclusive, irrevocable license to + exercise the Licensed Rights in the Licensed Material to: - APPENDIX: How to apply the Apache License to your work. + a. reproduce and Share the Licensed Material, in whole or + in part; and - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. + b. produce, reproduce, and Share Adapted Material. - Copyright 2016 The Kubernetes Authors + 2. Exceptions and Limitations. For the avoidance of doubt, where + Exceptions and Limitations apply to Your use, this Public + License does not apply, and You do not need to comply with + its terms and conditions. - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at + 3. Term. The term of this Public License is specified in Section + 6(a). - http://www.apache.org/licenses/LICENSE-2.0 + 4. Media and formats; technical modifications allowed. The + Licensor authorizes You to exercise the Licensed Rights in + all media and formats whether now known or hereafter created, + and to make technical modifications necessary to do so. The + Licensor waives and/or agrees not to assert any right or + authority to forbid You from making technical modifications + necessary to exercise the Licensed Rights, including + technical modifications necessary to circumvent Effective + Technological Measures. For purposes of this Public License, + simply making modifications authorized by this Section 2(a) + (4) never produces Adapted Material. - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. + 5. Downstream recipients. + + a. Offer from the Licensor -- Licensed Material. Every + recipient of the Licensed Material automatically + receives an offer from the Licensor to exercise the + Licensed Rights under the terms and conditions of this + Public License. + + b. No downstream restrictions. You may not offer or impose + any additional or different terms or conditions on, or + apply any Effective Technological Measures to, the + Licensed Material if doing so restricts exercise of the + Licensed Rights by any recipient of the Licensed + Material. + + 6. No endorsement. Nothing in this Public License constitutes or + may be construed as permission to assert or imply that You + are, or that Your use of the Licensed Material is, connected + with, or sponsored, endorsed, or granted official status by, + the Licensor or others designated to receive attribution as + provided in Section 3(a)(1)(A)(i). + + b. Other rights. + + 1. Moral rights, such as the right of integrity, are not + licensed under this Public License, nor are publicity, + privacy, and/or other similar personality rights; however, to + the extent possible, the Licensor waives and/or agrees not to + assert any such rights held by the Licensor to the limited + extent necessary to allow You to exercise the Licensed + Rights, but not otherwise. + + 2. Patent and trademark rights are not licensed under this + Public License. + + 3. To the extent possible, the Licensor waives any right to + collect royalties from You for the exercise of the Licensed + Rights, whether directly or through a collecting society + under any voluntary or waivable statutory or compulsory + licensing scheme. In all other cases the Licensor expressly + reserves any right to collect such royalties. + + +Section 3 -- License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the +following conditions. + + a. Attribution. + + 1. If You Share the Licensed Material (including in modified + form), You must: + + a. retain the following if it is supplied by the Licensor + with the Licensed Material: + + i. identification of the creator(s) of the Licensed + Material and any others designated to receive + attribution, in any reasonable manner requested by + the Licensor (including by pseudonym if + designated); + + ii. a copyright notice; + + iii. a notice that refers to this Public License; + + iv. a notice that refers to the disclaimer of + warranties; + + v. a URI or hyperlink to the Licensed Material to the + extent reasonably practicable; + + b. indicate if You modified the Licensed Material and + retain an indication of any previous modifications; and + + c. indicate the Licensed Material is licensed under this + Public License, and include the text of, or the URI or + hyperlink to, this Public License. + + 2. You may satisfy the conditions in Section 3(a)(1) in any + reasonable manner based on the medium, means, and context in + which You Share the Licensed Material. For example, it may be + reasonable to satisfy the conditions by providing a URI or + hyperlink to a resource that includes the required + information. + + 3. If requested by the Licensor, You must remove any of the + information required by Section 3(a)(1)(A) to the extent + reasonably practicable. + + 4. If You Share Adapted Material You produce, the Adapter's + License You apply must not prevent recipients of the Adapted + Material from complying with this Public License. + + +Section 4 -- Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that +apply to Your use of the Licensed Material: + + a. for the avoidance of doubt, Section 2(a)(1) grants You the right + to extract, reuse, reproduce, and Share all or a substantial + portion of the contents of the database; + + b. if You include all or a substantial portion of the database + contents in a database in which You have Sui Generis Database + Rights, then the database in which You have Sui Generis Database + Rights (but not its individual contents) is Adapted Material; and + + c. You must comply with the conditions in Section 3(a) if You Share + all or a substantial portion of the contents of the database. + +For the avoidance of doubt, this Section 4 supplements and does not +replace Your obligations under this Public License where the Licensed +Rights include other Copyright and Similar Rights. + + +Section 5 -- Disclaimer of Warranties and Limitation of Liability. + + a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE + EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS + AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF + ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, + IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, + WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, + ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT + KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT + ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. + + b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE + TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, + NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, + INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, + COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR + USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR + DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR + IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. + + c. The disclaimer of warranties and limitation of liability provided + above shall be interpreted in a manner that, to the extent + possible, most closely approximates an absolute disclaimer and + waiver of all liability. + + +Section 6 -- Term and Termination. + + a. This Public License applies for the term of the Copyright and + Similar Rights licensed here. However, if You fail to comply with + this Public License, then Your rights under this Public License + terminate automatically. + + b. Where Your right to use the Licensed Material has terminated under + Section 6(a), it reinstates: + + 1. automatically as of the date the violation is cured, provided + it is cured within 30 days of Your discovery of the + violation; or + + 2. upon express reinstatement by the Licensor. + + For the avoidance of doubt, this Section 6(b) does not affect any + right the Licensor may have to seek remedies for Your violations + of this Public License. + + c. For the avoidance of doubt, the Licensor may also offer the + Licensed Material under separate terms or conditions or stop + distributing the Licensed Material at any time; however, doing so + will not terminate this Public License. + + d. Sections 1, 5, 6, 7, and 8 survive termination of this Public + License. + + +Section 7 -- Other Terms and Conditions. + + a. The Licensor shall not be bound by any additional or different + terms or conditions communicated by You unless expressly agreed. + + b. Any arrangements, understandings, or agreements regarding the + Licensed Material not stated herein are separate from and + independent of the terms and conditions of this Public License. + + +Section 8 -- Interpretation. + + a. For the avoidance of doubt, this Public License does not, and + shall not be interpreted to, reduce, limit, restrict, or impose + conditions on any use of the Licensed Material that could lawfully + be made without permission under this Public License. + + b. To the extent possible, if any provision of this Public License is + deemed unenforceable, it shall be automatically reformed to the + minimum extent necessary to make it enforceable. If the provision + cannot be reformed, it shall be severed from this Public License + without affecting the enforceability of the remaining terms and + conditions. + + c. No term or condition of this Public License will be waived and no + failure to comply consented to unless expressly agreed to by the + Licensor. + + d. Nothing in this Public License constitutes or may be interpreted + as a limitation upon, or waiver of, any privileges and immunities + that apply to the Licensor or You, including from the legal + processes of any jurisdiction or authority. + + +======================================================================= + +Creative Commons is not a party to its public +licenses. Notwithstanding, Creative Commons may elect to apply one of +its public licenses to material it publishes and in those instances +will be considered the “Licensor.” The text of the Creative Commons +public licenses is dedicated to the public domain under the CC0 Public +Domain Dedication. Except for the limited purpose of indicating that +material is shared under a Creative Commons public license or as +otherwise permitted by the Creative Commons policies published at +creativecommons.org/policies, Creative Commons does not authorize the +use of the trademark "Creative Commons" or any other trademark or logo +of Creative Commons without its prior written consent including, +without limitation, in connection with any unauthorized modifications +to any of its public licenses or any other arrangements, +understandings, or agreements concerning use of licensed material. For +the avoidance of doubt, this paragraph does not form part of the +public licenses. + +Creative Commons may be contacted at creativecommons.org. From e9591bb3ee92df5deb8ef485722adb786874986a Mon Sep 17 00:00:00 2001 From: craigbox Date: Tue, 22 Nov 2016 13:22:38 +0000 Subject: [PATCH 04/30] Add license to footer - Change "Kubernetes", which is not a thing you can assign copyright to, to "The Kubernetes Authors", in line with comments in source files. This may or may not be more appropriate to assign copyright to CNCF. - Add link to LICENSE with CC BY SA text, which will only be true when #1763 is merged. - I don't think you'll like the CSS, but without the 'light-text' tag you get a blue/purple link. --- _includes/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/footer.html b/_includes/footer.html index e7fa36d26a..5e724f710c 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -24,6 +24,6 @@ Contribute to the K8s codebase -
© {{ 'now' | date: "%Y" }} Kubernetes
+
© {{ 'now' | date: "%Y" }} The Kubernetes Authors | Distributed under CC BY 4.0
From 1bcb4cd558356dcdb44035e4a3813341f4f0fc2b Mon Sep 17 00:00:00 2001 From: Justin Peterson Date: Tue, 22 Nov 2016 19:15:40 -0800 Subject: [PATCH 05/30] Fix for Issue 1767 --- .../public/images/module_01_cluster.svg | 582 ++++++------------ 1 file changed, 177 insertions(+), 405 deletions(-) diff --git a/docs/tutorials/kubernetes-basics/public/images/module_01_cluster.svg b/docs/tutorials/kubernetes-basics/public/images/module_01_cluster.svg index 054a9f78eb..e1f92dace0 100644 --- a/docs/tutorials/kubernetes-basics/public/images/module_01_cluster.svg +++ b/docs/tutorials/kubernetes-basics/public/images/module_01_cluster.svg @@ -1,9 +1,6 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + Docker + Kubelt + + + Layer 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 1f685261595f13d238aaf7ba52f1d9f67fd3f508 Mon Sep 17 00:00:00 2001 From: Vincenzo Ferrari Date: Wed, 23 Nov 2016 11:12:07 +0100 Subject: [PATCH 06/30] updated dockerimage link removed dead link of dockerimage --- docs/user-guide/images.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user-guide/images.md b/docs/user-guide/images.md index e739bb0ca9..582961593f 100644 --- a/docs/user-guide/images.md +++ b/docs/user-guide/images.md @@ -5,7 +5,7 @@ assignees: --- -Each container in a pod has its own image. Currently, the only type of image supported is a [Docker Image](https://docs.docker.com/userguide/dockerimages/). +Each container in a pod has its own image. Currently, the only type of image supported is a [Docker Image](https://docs.docker.com/engine/tutorials/dockerimages/). You create your Docker image and push it to a registry before referring to it in a Kubernetes pod. From 5a54ed400cde4693c055d9bbe0fd1c8d892a8694 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Wed, 23 Nov 2016 14:25:09 +0000 Subject: [PATCH 07/30] Clarify that no add-ons are preferred above others --- docs/getting-started-guides/network-policy/walkthrough.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/getting-started-guides/network-policy/walkthrough.md b/docs/getting-started-guides/network-policy/walkthrough.md index 49da17e6ef..8384bcdb34 100644 --- a/docs/getting-started-guides/network-policy/walkthrough.md +++ b/docs/getting-started-guides/network-policy/walkthrough.md @@ -11,7 +11,7 @@ In this article, we assume a Kubernetes cluster has been created with network po * [Calico](/docs/getting-started-guides/network-policy/calico/) * [Romana](/docs/getting-started-guides/network-policy/romana/) -The reference implementation is [Calico](/docs/getting-started-guides/network-policy/calico) running on GCE. +Add-ons are sorted alphabetically - the ordering does not imply any preferential status. The following example walkthrough will work on a Kubernetes cluster using any of the listed providers. From c01aaba15624a04e858247220afac6f14edc5a7c Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Wed, 23 Nov 2016 14:15:35 +0000 Subject: [PATCH 08/30] Add Weave to the list of NetworkPolicy implementations --- .../network-policy/walkthrough.md | 1 + docs/getting-started-guides/network-policy/weave.md | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 docs/getting-started-guides/network-policy/weave.md diff --git a/docs/getting-started-guides/network-policy/walkthrough.md b/docs/getting-started-guides/network-policy/walkthrough.md index 49da17e6ef..973903ceed 100644 --- a/docs/getting-started-guides/network-policy/walkthrough.md +++ b/docs/getting-started-guides/network-policy/walkthrough.md @@ -10,6 +10,7 @@ In this article, we assume a Kubernetes cluster has been created with network po * [Calico](/docs/getting-started-guides/network-policy/calico/) * [Romana](/docs/getting-started-guides/network-policy/romana/) +* [Weave Net](/docs/getting-started-guides/network-policy/weave/) The reference implementation is [Calico](/docs/getting-started-guides/network-policy/calico) running on GCE. diff --git a/docs/getting-started-guides/network-policy/weave.md b/docs/getting-started-guides/network-policy/weave.md new file mode 100644 index 0000000000..8d5896861d --- /dev/null +++ b/docs/getting-started-guides/network-policy/weave.md @@ -0,0 +1,11 @@ +--- +assignees: +- bboreham + +--- + +The [Weave Net Addon](https://www.weave.works/docs/net/latest/kube-addon/) for Kubernetes comes with a Network Policy Controller. + +This component automatically monitors Kubernetes for any NetworkPolicy annotations on all namespaces, and configures `iptables` rules to allow or block traffic as directed by the policies. + +Once you have installed the Weave Net Addon you can follow the [NetworkPolicy gettting started guide](/docs/getting-started-guides/network-policy/walkthrough) to try out Kubernetes NetworkPolicy. From 8e8adadbeb8c3c328e44bc386d431f832b2472f4 Mon Sep 17 00:00:00 2001 From: Justin Garrison Date: Sat, 26 Nov 2016 23:57:01 -0800 Subject: [PATCH 09/30] moved kubectl install to separate sub-sections --- docs/user-guide/prereqs.md | 63 +++++++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 25 deletions(-) diff --git a/docs/user-guide/prereqs.md b/docs/user-guide/prereqs.md index ccaacb7db8..1902e3315a 100644 --- a/docs/user-guide/prereqs.md +++ b/docs/user-guide/prereqs.md @@ -7,39 +7,52 @@ assignees: To deploy and manage applications on Kubernetes, you’ll use the Kubernetes command-line tool, [kubectl](/docs/user-guide/kubectl/). It lets you inspect your cluster resources, create, delete, and update components, and much more. You will use it to look at your new cluster and bring up example apps. -## Installing kubectl +## Install kubectl Binary Via curl -If you downloaded a pre-compiled [release](https://github.com/kubernetes/kubernetes/releases), kubectl should be under `platforms//` from the tar bundle. - -If you built from source, kubectl should be either under `_output/local/bin//` or `_output/dockerized/bin//`. - -If you don't have the source code checked out you can download the compiled kubectl binary for each release with curl +Download the latest release with the command: ```shell -# Linux -curl -LO https://storage.googleapis.com/kubernetes-release/release/${K8S_VERSION}/bin/linux/amd64/kubectl # OS X -curl -LO https://storage.googleapis.com/kubernetes-release/release/${K8S_VERSION}/bin/darwin/amd64/kubectl +curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/darwin/amd64/kubectl + +# Linux +curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl +``` + +If you want to download a specific version of kubectl you can replace the nested curl command from above with the version you want. (e.g. v1.4.6, v1.5.0-beta.2) + +Make the kubectl binary executable and move it to your PATH (e.g. `/usr/local/bin`): + +```shell +chmod +x ./kubectl +sudo mv ./kubectl /usr/local/bin/kubectl +``` + +## Extract kubectl from Release .tar.gz or Compiled Source + +If you downloaded a pre-compiled [release](https://github.com/kubernetes/kubernetes/releases), kubectl will be under `platforms//` from the tar bundle. + +If you compiled kubernetes from source, kubectl should be either under `_output/local/bin//` or `_output/dockerized/bin//`. + +Copy or move kubectl into a directory already in your PATH (e.g. `/usr/local/bin`). For example: + +```shell +# OS X +sudo cp platforms/darwin/amd64/kubectl /usr/local/bin/kubectl + +# Linux +sudo cp platforms/linux/amd64/kubectl /usr/local/bin/kubectl +``` + +Next make it executable with the following command: + +```shell +sudo chmod +x /usr/local/bin/kubectl ``` The kubectl binary doesn't have to be installed to be executable, but the rest of the walkthrough will assume that it's in your PATH. -The simplest way to install is to copy or move kubectl into a dir already in PATH (e.g. `/usr/local/bin`). For example: - -```shell -# OS X -$ sudo cp kubernetes/platforms/darwin/amd64/kubectl /usr/local/bin/kubectl -# Linux -$ sudo cp kubernetes/platforms/linux/amd64/kubectl /usr/local/bin/kubectl -``` - -You also need to ensure it's executable: - -```shell -$ sudo chmod +x /usr/local/bin/kubectl -``` - -If you prefer not to copy kubectl, you need to ensure the tool is in your path: +If you prefer not to copy kubectl, you need to ensure it is in your path: ```shell # OS X From a856ab1549417a243abd3bd5c63e50c1a99eed87 Mon Sep 17 00:00:00 2001 From: steveperry-53 Date: Mon, 28 Nov 2016 11:49:17 -0800 Subject: [PATCH 10/30] Update Tutorial and Task landing pages. --- docs/tasks/index.md | 8 +++++++- docs/tutorials/index.md | 5 ++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/docs/tasks/index.md b/docs/tasks/index.md index e59f8732b2..b71057e640 100644 --- a/docs/tasks/index.md +++ b/docs/tasks/index.md @@ -1,7 +1,9 @@ --- --- -The Tasks section of the Kubernetes documentation is a work in progress +This section of the Kubernetes documentation contains pages that +show how to do individual tasks. A task page shows how to do a +single thing, typically by giving a short sequence of steps. #### Configuring Pods and Containers @@ -13,6 +15,10 @@ The Tasks section of the Kubernetes documentation is a work in progress * [Using Port Forwarding to Access Applications in a Cluster](/docs/tasks/access-application-cluster/port-forward-access-application-cluster/) +#### Debugging Applications in a Cluster + +* [Determining the Reason for Pod Failure](/docs/tasks/debug-application-cluster/determine-reason-pod-failure/) + #### Accessing the Kubernetes API * [Using an HTTP Proxy to Access the Kubernetes API](/docs/tasks/access-kubernetes-api/http-proxy-access-api) diff --git a/docs/tutorials/index.md b/docs/tutorials/index.md index 60aab6a8fb..88c5b75807 100644 --- a/docs/tutorials/index.md +++ b/docs/tutorials/index.md @@ -1,7 +1,10 @@ --- --- -The Tutorials section of the Kubernetes documentation is a work in progress. +This section of the Kubernetes documentation contains tutorials. +A tutorial shows how to accomplish a goal that is larger than a single +[task](/docs/tasks/). Typically a tutorial has several sections, +each of which has a sequence of steps. #### Kubernetes Basics From a4f8d3c06a9ed5243330579dceadb4d26f9e2661 Mon Sep 17 00:00:00 2001 From: steveperry-53 Date: Wed, 23 Nov 2016 15:37:41 -0800 Subject: [PATCH 11/30] Remove old template topics. --- _data/support.yml | 2 - docs/contribute/page-templates.md | 3 + docs/templatedemos/OWNERS | 3 - docs/templatedemos/blank.md | 3 - docs/templatedemos/blankkubectl.md | 6 - docs/templatedemos/blanklanding.md | 3 - docs/templatedemos/blanktask.md | 3 - docs/templatedemos/filledout.md | 80 --------- docs/templatedemos/index.md | 249 ----------------------------- docs/templatedemos/kubectl.md | 7 - docs/templatedemos/landingpage.md | 53 ------ docs/templatedemos/partial.md | 6 - docs/templatedemos/task.md | 62 ------- 13 files changed, 3 insertions(+), 477 deletions(-) delete mode 100644 docs/templatedemos/OWNERS delete mode 100644 docs/templatedemos/blank.md delete mode 100644 docs/templatedemos/blankkubectl.md delete mode 100644 docs/templatedemos/blanklanding.md delete mode 100644 docs/templatedemos/blanktask.md delete mode 100644 docs/templatedemos/filledout.md delete mode 100644 docs/templatedemos/index.md delete mode 100644 docs/templatedemos/kubectl.md delete mode 100644 docs/templatedemos/landingpage.md delete mode 100644 docs/templatedemos/partial.md delete mode 100644 docs/templatedemos/task.md diff --git a/_data/support.yml b/_data/support.yml index 1b8e80699a..3e9ec08ee4 100644 --- a/_data/support.yml +++ b/_data/support.yml @@ -53,5 +53,3 @@ toc: path: https://github.com/kubernetes/kubernetes/milestones/ - title: Contributing to Kubernetes Documentation path: /editdocs/ - - title: New Template Instructions - path: /docs/templatedemos/ diff --git a/docs/contribute/page-templates.md b/docs/contribute/page-templates.md index 5bea261e3c..4b19cde39b 100644 --- a/docs/contribute/page-templates.md +++ b/docs/contribute/page-templates.md @@ -1,4 +1,7 @@ --- +redirect_from: + - /docs/templatedemos/ + - /docs/templatedemos.html ---