From 64378869cf20d4d20a069142cd92a3c13e2d1cb8 Mon Sep 17 00:00:00 2001 From: Jimmy song Date: Thu, 25 Jul 2019 16:58:57 +0800 Subject: [PATCH] Update --- CODE_OF_CONDUCT.md | 17 +- LICENSE | 526 ++++++++++++------ Makefile | 42 +- Makefile.local | 48 ++ cloud-native/cloud-native-definition.html | 19 +- .../cloud-native-local-quick-start.html | 33 +- cloud-native/cloud-native-philosophy.html | 19 +- ...native-programming-language-ballerina.html | 31 +- ...ud-native-programming-language-pulumi.html | 21 +- .../cloud-native-programming-languages.html | 19 +- .../from-kubernetes-to-cloud-native.html | 53 +- ...ernetes-and-cloud-native-app-overview.html | 51 +- cloud-native/play-with-kubernetes.html | 21 +- ...up-kubernetes-with-rancher-and-aliyun.html | 25 +- cloud-native/the-future-of-cloud-native.html | 51 +- concepts/admission-controller.html | 19 +- concepts/aggregated-api-server.html | 19 +- concepts/annotation.html | 19 +- concepts/apiservice.html | 19 +- concepts/authentication-and-permission.html | 19 +- concepts/calico.html | 23 +- concepts/cilium-concepts.html | 23 +- concepts/cilium.html | 21 +- concepts/cluster.html | 19 +- concepts/cni.html | 19 +- concepts/concepts.html | 21 +- concepts/configmap-hot-update.html | 19 +- concepts/configmap.html | 19 +- concepts/controllers.html | 19 +- concepts/crd.html | 19 +- concepts/cri.html | 21 +- concepts/cronjob.html | 19 +- concepts/csi.html | 19 +- concepts/custom-metrics-hpa.html | 19 +- concepts/custom-resource.html | 19 +- concepts/daemonset.html | 19 +- concepts/deployment.html | 21 +- concepts/etcd.html | 19 +- concepts/extension.html | 19 +- concepts/flannel.html | 21 +- concepts/garbage-collection.html | 19 +- concepts/horizontal-pod-autoscaling.html | 21 +- concepts/index.html | 33 +- concepts/ingress.html | 19 +- concepts/init-containers.html | 19 +- concepts/job.html | 19 +- concepts/label.html | 21 +- concepts/local-persistent-storage.html | 19 +- concepts/namespace.html | 19 +- concepts/network-policy.html | 19 +- concepts/networking.html | 19 +- concepts/node.html | 19 +- concepts/objects.html | 19 +- concepts/open-interfaces.html | 21 +- concepts/pause-container.html | 21 +- concepts/persistent-volume.html | 19 +- concepts/pod-disruption-budget.html | 19 +- concepts/pod-hook.html | 19 +- concepts/pod-lifecycle.html | 21 +- concepts/pod-overview.html | 21 +- concepts/pod-preset.html | 19 +- concepts/pod-security-policy.html | 19 +- concepts/pod-state-and-lifecycle.html | 19 +- concepts/pod.html | 23 +- concepts/qos.html | 19 +- concepts/rbac.html | 19 +- concepts/replicaset.html | 19 +- concepts/scheduling.html | 19 +- concepts/secret.html | 19 +- concepts/service-catalog.html | 29 +- concepts/service-discovery.html | 19 +- concepts/service.html | 25 +- concepts/serviceaccount.html | 19 +- concepts/statefulset.html | 19 +- concepts/storage.html | 19 +- concepts/storageclass.html | 19 +- concepts/taint-and-toleration.html | 19 +- concepts/traefik-ingress-controller.html | 19 +- concepts/volume.html | 19 +- gitbook/images/cc4-license.png | Bin 0 -> 1888 bytes guide/access-cluster.html | 19 +- guide/access-kubernetes-cluster.html | 19 +- ...etes-pods-from-outside-of-the-cluster.html | 19 +- ...plication-development-deployment-flow.html | 19 +- guide/auth-with-kubeconfig-or-token.html | 21 +- ...thenticate-across-clusters-kubeconfig.html | 19 +- guide/authentication.html | 21 +- ...cabin-mobile-dashboard-for-kubernetes.html | 23 +- guide/cluster-security-management.html | 19 +- guide/command-usage.html | 19 +- .../configure-liveness-readiness-probes.html | 19 +- guide/configure-pod-service-account.html | 19 +- ...nnecting-to-applications-port-forward.html | 19 +- guide/deploy-applications-in-kubernetes.html | 33 +- guide/docker-cli-to-kubectl.html | 19 +- guide/index.html | 19 +- guide/ip-masq-agent.html | 21 +- guide/kubectl-cheatsheet.html | 19 +- ...ctl-user-authentication-authorization.html | 19 +- .../kubelet-authentication-authorization.html | 19 +- guide/kubernator-kubernetes-ui.html | 23 +- guide/kubernetes-desktop-client.html | 21 +- guide/kubernetes-security-best-practice.html | 19 +- guide/managing-tls-in-a-cluster.html | 19 +- .../migrating-hadoop-yarn-to-kubernetes.html | 27 +- guide/resource-configuration.html | 19 +- guide/resource-quota-management.html | 19 +- guide/secret-configuration.html | 19 +- guide/service-access-application-cluster.html | 19 +- guide/tls-bootstrapping.html | 19 +- ...ing-etcdctl-to-access-kubernetes-data.html | 19 +- guide/using-kubectl.html | 27 +- guide/using-statefulset.html | 19 +- images/cc4-license.png | Bin 0 -> 1888 bytes index.html | 40 +- practice/configuring-dns.html | 21 +- practice/coredns.html | 19 +- practice/create-kubeconfig.html | 19 +- practice/create-tls-and-secret-key.html | 19 +- practice/dashboard-addon-installation.html | 25 +- practice/distributed-load-test.html | 29 +- practice/dns-installation.html | 19 +- practice/edge-node-configuration.html | 23 +- practice/efk-addon-installation.html | 23 +- practice/etcd-cluster-installation.html | 19 +- practice/flannel-installation.html | 19 +- practice/heapster-addon-installation.html | 27 +- practice/index.html | 19 +- practice/install-kubernetes-on-centos.html | 19 +- ...s-on-ubuntu-server-16.04-with-kubeadm.html | 19 +- practice/install-kubernetes-with-kubeadm.html | 19 +- practice/kubectl-installation.html | 19 +- practice/kubedns-addon-installation.html | 19 +- practice/master-installation.html | 19 +- .../network-and-cluster-perfermance-test.html | 23 +- practice/nginx-ingress-installation.html | 19 +- practice/node-installation.html | 21 +- practice/operation.html | 19 +- .../service-discovery-and-loadbalancing.html | 19 +- practice/traefik-ingress-installation.html | 25 +- scripts/Dockerfile | 4 + scripts/build-gitbook.sh | 4 + scripts/lint-gitbook.sh | 8 + 143 files changed, 1565 insertions(+), 1941 deletions(-) create mode 100644 Makefile.local create mode 100644 gitbook/images/cc4-license.png create mode 100644 images/cc4-license.png create mode 100644 scripts/build-gitbook.sh create mode 100644 scripts/lint-gitbook.sh diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index d691b0a73..3e948d44c 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -29,6 +29,19 @@ 4. 在浏览器中访问 http://localhost:4000 5. 生成的文档在 `_book` 目录下 +**Docker** + +本书提供了 Docker 构建方式。 + +```bash +make install +make build +``` + +继续运行 `make serve` 即可渲染 gitbook，通过 查看。 + +注：使用 `docker ps` 找到该容器 ID 后，使用 `docker kill $ID` 可以关掉网站。 + **下载 PDF/ePub/Mobi 格式文档本地查看** 访问 [gitbook](https://www.gitbook.com/book/rootsongjc/kubernetes-handbook/details) 可以看到下载地址，可以下载根据最新文档生成的 **PDF/ePub/Mobi** 格式文档（文档的注脚中注明了更新时间），同时也可以直接在 gitbook 中阅读，不过 gitbook 不太稳定打开速度较慢，建议大家直接在 https://jimmysong.io/kubernetes-handbook/ 浏览。 @@ -39,7 +52,7 @@ - **On Mac** -在Mac下安装后，使用该命令创建链接 +在Mac下安装后，使用该命令创建链接： ```bash ln -s /Applications/calibre.app/Contents/MacOS/ebook-convert /usr/local/bin @@ -51,6 +64,8 @@ ln -s /Applications/calibre.app/Contents/MacOS/ebook-convert /usr/local/bin gitbook pdf . ./kubernetes-handbook.pdf ``` +**注：因为各种依赖问题，通过 docker 方式暂时无法构建 PDF。** + - **On Windows** 需要用到的工具：[calibre](http://calibre-ebook.com/)，[phantomjs](http://phantomjs.org/download.html) diff --git a/LICENSE b/LICENSE index 9e30b4f34..b6988e7ed 100644 --- a/LICENSE +++ b/LICENSE @@ -1,187 +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. + + 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. + + 3. Term. The term of this Public License is specified in Section + 6(a). + + 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. + + 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. diff --git a/Makefile b/Makefile index d147079a9..ae94b0141 100644 --- a/Makefile +++ b/Makefile @@ -1,36 +1,36 @@ BOOK_NAME := kubernetes-handbook BOOK_OUTPUT := _book +image := jimmysong/gitbook-builder:2019-07-25 +docker := docker run -t -i --sig-proxy=true --rm -v $(shell pwd):/gitbook -w /gitbook -p 4000:4000 $(image) .PHONY: build build: - gitbook build . $(BOOK_OUTPUT) - cp images/apple-touch-icon-precomposed-152.png $(BOOK_OUTPUT)/gitbook/images + @$(docker) scripts/build-gitbook.sh .PHONY: lint lint: + @$(docker) scripts/lint-gitbook.sh htmlproofer --url-ignore "/localhost/,/172.17.8.101/,/172.20.0.113/,/slideshare.net/,/grpc.io/,/kiali.io/,/condiut.io/,/twitter.com/,/facebook.com/,/medium.com/,/google.com/,/jimmysong.io/,/openfaas.com/,/linkerd.io/,/layer5.io/,/thenewstack.io/,/blog.envoyproxy.io/,/blog.openebs.io/,/k8smeetup.github.io/,/blog.heptio.com/,/apigee.com/,/speakerdeck.com/,/download.svcat.sh/,/blog.fabric8.io/,/blog.heptio.com/,/blog.containership.io/,/blog.mobyproject.org/,/blog.spinnaker.io/,/coscale.com/,/zh.wikipedia.org/,/labs.play-with-k8s.com/,/cilium.readthedocs.io/,/azure.microsoft.com/,/storageos.com/,/openid.net/,/prometheus.io/,/coreos.com/,/openwhisk.incubator.apache.org/" $(BOOK_OUTPUT) -.PHONY: serve -serve: - gitbook serve . $(BOOK_OUTPUT) - -.PHONY: epub -epub: - gitbook epub . $(BOOK_NAME).epub - -.PHONY: pdf -pdf: - gitbook pdf . $(BOOK_NAME).pdf - -.PHONY: mobi -mobi: - gitbook mobi . $(BOOK_NAME).mobi - .PHONY: install install: - npm install gitbook-cli -g - gitbook install - gem install html-proofer + @$(docker) gitbook install + +.PHONY: serve +serve: + @$(docker) gitbook serve . $(BOOK_OUTPUT) + +.PHONY: epub +epub: + @$(docker) gitbook epub . $(BOOK_NAME).epub + +.PHONY: pdf +pdf: + @$(docker) gitbook pdf . $(BOOK_NAME).pdf + +.PHONY: mobi +mobi: + @$(docker) gitbook mobi . $(BOOK_NAME).mobi .PHONY: clean clean: diff --git a/Makefile.local b/Makefile.local new file mode 100644 index 000000000..d147079a9 --- /dev/null +++ b/Makefile.local @@ -0,0 +1,48 @@ +BOOK_NAME := kubernetes-handbook +BOOK_OUTPUT := _book + +.PHONY: build +build: + gitbook build . $(BOOK_OUTPUT) + cp images/apple-touch-icon-precomposed-152.png $(BOOK_OUTPUT)/gitbook/images + +.PHONY: lint +lint: + htmlproofer --url-ignore "/localhost/,/172.17.8.101/,/172.20.0.113/,/slideshare.net/,/grpc.io/,/kiali.io/,/condiut.io/,/twitter.com/,/facebook.com/,/medium.com/,/google.com/,/jimmysong.io/,/openfaas.com/,/linkerd.io/,/layer5.io/,/thenewstack.io/,/blog.envoyproxy.io/,/blog.openebs.io/,/k8smeetup.github.io/,/blog.heptio.com/,/apigee.com/,/speakerdeck.com/,/download.svcat.sh/,/blog.fabric8.io/,/blog.heptio.com/,/blog.containership.io/,/blog.mobyproject.org/,/blog.spinnaker.io/,/coscale.com/,/zh.wikipedia.org/,/labs.play-with-k8s.com/,/cilium.readthedocs.io/,/azure.microsoft.com/,/storageos.com/,/openid.net/,/prometheus.io/,/coreos.com/,/openwhisk.incubator.apache.org/" $(BOOK_OUTPUT) + +.PHONY: serve +serve: + gitbook serve . $(BOOK_OUTPUT) + +.PHONY: epub +epub: + gitbook epub . $(BOOK_NAME).epub + +.PHONY: pdf +pdf: + gitbook pdf . $(BOOK_NAME).pdf + +.PHONY: mobi +mobi: + gitbook mobi . $(BOOK_NAME).mobi + +.PHONY: install +install: + npm install gitbook-cli -g + gitbook install + gem install html-proofer + +.PHONY: clean +clean: + rm -rf $(BOOK_OUTPUT) + +.PHONY: help +help: + @echo "Help for make" + @echo "make - Build the book" + @echo "make build - Build the book" + @echo "make serve - Serving the book on localhost:4000" + @echo "make install - Install gitbook and plugins" + @echo "make epub - Build epub book" + @echo "make pdf - Build pdf book" + @echo "make clean - Remove generated files" diff --git a/cloud-native/cloud-native-definition.html b/cloud-native/cloud-native-definition.html index 58cc5ff73..bbf6a682a 100644 --- a/cloud-native/cloud-native-definition.html +++ b/cloud-native/cloud-native-definition.html @@ -136,12 +136,12 @@
  • - ServiceMesher社区 + ServiceMesher社区
  • - SOFAMesh - 基于Istio的大规模服务网格解决方案 + SOFAMesh - 基于Istio的大规模服务网格解决方案
    • @@ -151,17 +151,12 @@
  • - SOFAMosn - Golang版的高性能Service Mesh Sidecar代理 + SOFAMosn - Golang版的高性能Service Mesh Sidecar代理
  • - Awesome Service Mesh -
    • - - -
  • - Istio Handbook - Istio服务网格进阶实战 + Istio Handbook - Istio服务网格进阶实战
    • @@ -4562,8 +4557,8 @@

    The Cloud Native Computing Foundation seeks to drive adoption of this paradigm by fostering and sustaining an ecosystem of open source, vendor-neutral projects. We democratize state-of-the-art patterns to make these innovations accessible for everyone.

    云原生计算基金会（CNCF）致力于培育和维护一个厂商中立的开源生态系统，来推广云原生技术。我们通过将最前沿的模式民主化，让这些创新为大众所用。

    -