From 31d5403019671fd13b59a5ecdc59fcf133978c84 Mon Sep 17 00:00:00 2001 From: Jack Xie Date: Thu, 23 May 2019 16:50:04 -0700 Subject: [PATCH 01/13] init --- README_en.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 README_en.md diff --git a/README_en.md b/README_en.md new file mode 100644 index 0000000000..9ea2c66d7b --- /dev/null +++ b/README_en.md @@ -0,0 +1,15 @@ +![蓝鲸容器管理平台.png](./docs/logo/bcs_en.png) +--- +[![license](https://img.shields.io/badge/license-mit-brightgreen.svg?style=flat)](https://github.com/Tencent/bk-bcs/blob/master/LICENSE)[![Release Version](https://img.shields.io/badge/release-1.12.0-brightgreen.svg)](https://github.com/Tencent/bk-bcs/releases)[![Build Status](https://travis-ci.org/Tencent/bk-bcs.svg?branch=master)](https://travis-ci.org/Tencent/bk-bcs)[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/bk-bcs/pulls) + +The Blue King Container Management Platform (BCS) is a basic service platform for the micro-service business based on container technology under the Blue Whale system. + +The Blue Whale Container Management Platform provides a two-engine-driven container orchestration scheme based on native k8s and mesos bk-framework, and users can choose to use one of them to orchestrate their own applications. The k8s method is mainly based on community programs. In addition to providing native functional support, it also realizes the seamless integration of native k8s and blue whale systems. Users can experience container technology and k8s community in a blue whale system in a way that is indistinguishable from tradition. Convenience. The mesos bk-framwork solution is a second-developed container orchestration program for blue whales that requires deep customization. If you need to create a highly personalized container platform for special application scenarios, the mesos bk-framework solution is No choice. + +In addition to the orchestration program, the Blue Whale Container Management Platform also provides an indiscriminate service management solution to provide services such as service registration and service discovery, load balancing, DNS, and traffic proxies. + +This open source version is consistent with the Blue Whale Container Management Platform version of the Blue Whale Community Edition and is updated synchronously. And the Blue Whale Community Edition will have a built-in SaaS docking blue whale container management platform to provide users with containerized interface operations. + +## Overview + +* [Architecture Design] (. From a1f72f7907726d8d5c5c3143b74979a489626ca5 Mon Sep 17 00:00:00 2001 From: Jack Xie Date: Thu, 23 May 2019 16:51:13 -0700 Subject: [PATCH 02/13] change logo --- README_en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_en.md b/README_en.md index 9ea2c66d7b..be5c701ba8 100644 --- a/README_en.md +++ b/README_en.md @@ -1,4 +1,4 @@ -![蓝鲸容器管理平台.png](./docs/logo/bcs_en.png) +![BCS.png](./docs/logo/logo_en.png) --- [![license](https://img.shields.io/badge/license-mit-brightgreen.svg?style=flat)](https://github.com/Tencent/bk-bcs/blob/master/LICENSE)[![Release Version](https://img.shields.io/badge/release-1.12.0-brightgreen.svg)](https://github.com/Tencent/bk-bcs/releases)[![Build Status](https://travis-ci.org/Tencent/bk-bcs.svg?branch=master)](https://travis-ci.org/Tencent/bk-bcs)[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/bk-bcs/pulls) From 4660c89a545605297b20eae58df197ccfe307c5a Mon Sep 17 00:00:00 2001 From: Jack Xie Date: Thu, 23 May 2019 17:17:06 -0700 Subject: [PATCH 03/13] first version --- README_en.md | 60 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 54 insertions(+), 6 deletions(-) diff --git a/README_en.md b/README_en.md index be5c701ba8..8199e07c88 100644 --- a/README_en.md +++ b/README_en.md @@ -1,15 +1,63 @@ ![BCS.png](./docs/logo/logo_en.png) --- -[![license](https://img.shields.io/badge/license-mit-brightgreen.svg?style=flat)](https://github.com/Tencent/bk-bcs/blob/master/LICENSE)[![Release Version](https://img.shields.io/badge/release-1.12.0-brightgreen.svg)](https://github.com/Tencent/bk-bcs/releases)[![Build Status](https://travis-ci.org/Tencent/bk-bcs.svg?branch=master)](https://travis-ci.org/Tencent/bk-bcs)[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/bk-bcs/pulls) +[![license](https://img.shields.io/badge/license-mit-brightgreen.svg?style=flat)](https://github.com/Tencent/bk-bcs/blob/master/LICENSE)[![Release Version](https://img.shields.io/badge/release-1.12.0-brightgreen.svg)](https://github.com/Tencent/bk-bcs/releases)[![Build Status](https://travis-ci.org/Tencent/bk-bcs.svg?branch=master)](https://travis-ci.org/Tencent/bk-bcs)[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/bk-bcs/pulls) -The Blue King Container Management Platform (BCS) is a basic service platform for the micro-service business based on container technology under the Blue Whale system. -The Blue Whale Container Management Platform provides a two-engine-driven container orchestration scheme based on native k8s and mesos bk-framework, and users can choose to use one of them to orchestrate their own applications. The k8s method is mainly based on community programs. In addition to providing native functional support, it also realizes the seamless integration of native k8s and blue whale systems. Users can experience container technology and k8s community in a blue whale system in a way that is indistinguishable from tradition. Convenience. The mesos bk-framwork solution is a second-developed container orchestration program for blue whales that requires deep customization. If you need to create a highly personalized container platform for special application scenarios, the mesos bk-framework solution is No choice. +BlueKing Container Service (BCS) is a container management and orchestration platform for the micro-services under the BlueKing echo system. -In addition to the orchestration program, the Blue Whale Container Management Platform also provides an indiscriminate service management solution to provide services such as service registration and service discovery, load balancing, DNS, and traffic proxies. +BlueKing Container Service provides a two-engine-driven container orchestration scheme based on native Kubernetes and mesos bk-framework, and users can choose to either one of them to orchestrate their own applications. The Kubernetes method is mainly based on Kubernetes solution. In addition to providing native functional support, it also provide the seamless integration of native Kubernetes and BlueKing platform. Users can experience container technology with Kubernetes community edition in the BlueKing platform in a way that is indistinguishable and convenient. The mesos+bk-framwork solution is a container orchestration program for BlueKing that capable for customization. If you need to create a highly personalized container platform for special application scenarios, the mesos bk-framework solution is a great choice. -This open source version is consistent with the Blue Whale Container Management Platform version of the Blue Whale Community Edition and is updated synchronously. And the Blue Whale Community Edition will have a built-in SaaS docking blue whale container management platform to provide users with containerized interface operations. +In addition to the orchestration program, the BlueKIng Container Service also provides an indiscriminate service management solution to provide services such as service registration, service discovery, load balancing, DNS, and traffic proxies. + +The open source version is consistent with the BlueKing Container Management Platform version of the BlueKing Community Edition and is updated synchronously. BlueKing community Edition will have a built-in SaaS(Software As A Service) to communicate with BCS, this will provide users with interface to view container operations. ## Overview -* [Architecture Design] (. +* [Architecture Design] (./docs/overview/architecture.md) +* [code structure] (./docs/overview/code_directory.md) +* [Function Description] (./docs/overview/function.md) + +## Features + +* Support for dual engine orchestration based on Kubernetes and Mesos +* Support multi-cluster management +* Support plug-in custom orchestration scheduling strategy +* Support service upgrade, expansion and expansion, rolling upgrade, blue and green release, etc. +* Support configmap, secret, disk volume mount, shared disk mount, etc. +* Support basic service management solutions such as service discovery, domain name resolution, and access agents, etc +* Support for scalable resource quota definitions +* Support in-container IPC mechanism +* Support multiple container network solutions (CNI) + +For a detailed description of the above features, please refer to the BlueKing Container Management Platform [white paper] (https://bk.tencent.com/docs/) + +## Getting Started + +* [Download and Compile] (docs/install/source_compile.md) +* [Installation Deployment] (docs/install/deploy-guide.md) +* [API Usage Notes] (./docs/apidoc/api.md) + +## Version Plan + +* [Version Details] (./docs/version/README.md) + +## Contributing + +Interested in the project, and want to contribute and improve the project together, please refer to [contributing] (./CONTRIBUTING.md). +[Tencent Open Source Incentive Program] (https://opensource.tencent.com/contribution) Encourage developers to participate and contribute, and look forward to your joining us. + +## Support + +* Refer to bk-bcs [installation documentation] (docs/install/deploy-guide.md) +* Read [source code] (https://github.com/Tencent/bk-bcs) +* Read [wiki] (https://github.com/Tencent/bk-bcs/wiki) or ask for help +* Learn about the BlueKing Community: Wechat search 蓝鲸社区版交流群 +* Contact us, technical exchange via QQ group: + +## FAQ + +[https://github.com/Tencent/bk-bcs/wiki/FAQ] (https://github.com/Tencent/bk-bcs/wiki/FAQ) + +## License + +Bk-bcs is based on the MIT protocol. Please refer to [LICENSE](./LICENSE.TXT) for details. From 6032bb09f088c0d43904489cdb31d6816d4a84c0 Mon Sep 17 00:00:00 2001 From: Jack Xie Date: Thu, 23 May 2019 17:19:07 -0700 Subject: [PATCH 04/13] fix links --- README_en.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/README_en.md b/README_en.md index 8199e07c88..b5af672af2 100644 --- a/README_en.md +++ b/README_en.md @@ -13,9 +13,9 @@ The open source version is consistent with the BlueKing Container Management Pla ## Overview -* [Architecture Design] (./docs/overview/architecture.md) -* [code structure] (./docs/overview/code_directory.md) -* [Function Description] (./docs/overview/function.md) +* [Architecture Design](./docs/overview/architecture.md) +* [code structure](./docs/overview/code_directory.md) +* [Function Description](./docs/overview/function.md) ## Features @@ -29,34 +29,34 @@ The open source version is consistent with the BlueKing Container Management Pla * Support in-container IPC mechanism * Support multiple container network solutions (CNI) -For a detailed description of the above features, please refer to the BlueKing Container Management Platform [white paper] (https://bk.tencent.com/docs/) +For a detailed description of the above features, please refer to the BlueKing Container Management Platform [white paper](https://bk.tencent.com/docs/) ## Getting Started -* [Download and Compile] (docs/install/source_compile.md) -* [Installation Deployment] (docs/install/deploy-guide.md) -* [API Usage Notes] (./docs/apidoc/api.md) +* [Download and Compile](docs/install/source_compile.md) +* [Installation Deployment](docs/install/deploy-guide.md) +* [API Usage Notes](./docs/apidoc/api.md) ## Version Plan -* [Version Details] (./docs/version/README.md) +* [Version Details](./docs/version/README.md) ## Contributing -Interested in the project, and want to contribute and improve the project together, please refer to [contributing] (./CONTRIBUTING.md). -[Tencent Open Source Incentive Program] (https://opensource.tencent.com/contribution) Encourage developers to participate and contribute, and look forward to your joining us. +Interested in the project, and want to contribute and improve the project together, please refer to [contributing](./CONTRIBUTING.md). +[Tencent Open Source Incentive Program](https://opensource.tencent.com/contribution) Encourage developers to participate and contribute, and look forward to your joining us. ## Support * Refer to bk-bcs [installation documentation] (docs/install/deploy-guide.md) -* Read [source code] (https://github.com/Tencent/bk-bcs) -* Read [wiki] (https://github.com/Tencent/bk-bcs/wiki) or ask for help +* Read [source code](https://github.com/Tencent/bk-bcs) +* Read [wiki](https://github.com/Tencent/bk-bcs/wiki) or ask for help * Learn about the BlueKing Community: Wechat search 蓝鲸社区版交流群 * Contact us, technical exchange via QQ group: ## FAQ -[https://github.com/Tencent/bk-bcs/wiki/FAQ] (https://github.com/Tencent/bk-bcs/wiki/FAQ) +[https://github.com/Tencent/bk-bcs/wiki/FAQ](https://github.com/Tencent/bk-bcs/wiki/FAQ) ## License From b3660677523c5c00f7e60587761a77ef27aa6942 Mon Sep 17 00:00:00 2001 From: Jack Xie Date: Thu, 23 May 2019 17:22:21 -0700 Subject: [PATCH 05/13] fix ecosystem --- README_en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_en.md b/README_en.md index b5af672af2..090a8339d7 100644 --- a/README_en.md +++ b/README_en.md @@ -3,7 +3,7 @@ [![license](https://img.shields.io/badge/license-mit-brightgreen.svg?style=flat)](https://github.com/Tencent/bk-bcs/blob/master/LICENSE)[![Release Version](https://img.shields.io/badge/release-1.12.0-brightgreen.svg)](https://github.com/Tencent/bk-bcs/releases)[![Build Status](https://travis-ci.org/Tencent/bk-bcs.svg?branch=master)](https://travis-ci.org/Tencent/bk-bcs)[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/bk-bcs/pulls) -BlueKing Container Service (BCS) is a container management and orchestration platform for the micro-services under the BlueKing echo system. +BlueKing Container Service (BCS) is a container management and orchestration platform for the micro-services under the BlueKing ecosystem. BlueKing Container Service provides a two-engine-driven container orchestration scheme based on native Kubernetes and mesos bk-framework, and users can choose to either one of them to orchestrate their own applications. The Kubernetes method is mainly based on Kubernetes solution. In addition to providing native functional support, it also provide the seamless integration of native Kubernetes and BlueKing platform. Users can experience container technology with Kubernetes community edition in the BlueKing platform in a way that is indistinguishable and convenient. The mesos+bk-framwork solution is a container orchestration program for BlueKing that capable for customization. If you need to create a highly personalized container platform for special application scenarios, the mesos bk-framework solution is a great choice. From 3d05b1dd9974cb800ad1a07b51d52de1973d8117 Mon Sep 17 00:00:00 2001 From: Jack Xie Date: Thu, 23 May 2019 17:31:10 -0700 Subject: [PATCH 06/13] bk --- README_en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_en.md b/README_en.md index 090a8339d7..36061ce72b 100644 --- a/README_en.md +++ b/README_en.md @@ -5,7 +5,7 @@ BlueKing Container Service (BCS) is a container management and orchestration platform for the micro-services under the BlueKing ecosystem. -BlueKing Container Service provides a two-engine-driven container orchestration scheme based on native Kubernetes and mesos bk-framework, and users can choose to either one of them to orchestrate their own applications. The Kubernetes method is mainly based on Kubernetes solution. In addition to providing native functional support, it also provide the seamless integration of native Kubernetes and BlueKing platform. Users can experience container technology with Kubernetes community edition in the BlueKing platform in a way that is indistinguishable and convenient. The mesos+bk-framwork solution is a container orchestration program for BlueKing that capable for customization. If you need to create a highly personalized container platform for special application scenarios, the mesos bk-framework solution is a great choice. +BlueKing Container Service provides a two-engine-driven container orchestration scheme based on native Kubernetes and mesos `bk-framework`, and users can choose to either one of them to orchestrate their own applications. The Kubernetes method is mainly based on Kubernetes solution. In addition to providing native functional support, it also provide the seamless integration of native Kubernetes and BlueKing platform. Users can experience container technology with Kubernetes community edition in the BlueKing platform in a way that is indistinguishable and convenient. The mesos+bk-framwork solution is a container orchestration program for BlueKing that capable for customization. If you need to create a highly personalized container platform for special application scenarios, the mesos `bk-framework` solution is a great choice. In addition to the orchestration program, the BlueKIng Container Service also provides an indiscriminate service management solution to provide services such as service registration, service discovery, load balancing, DNS, and traffic proxies. From 187174eccd42f135901e2809d505753c1e9936cd Mon Sep 17 00:00:00 2001 From: Jack Xie Date: Thu, 23 May 2019 17:39:34 -0700 Subject: [PATCH 07/13] init --- README_en.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README_en.md b/README_en.md index 36061ce72b..d1fedbe82f 100644 --- a/README_en.md +++ b/README_en.md @@ -5,11 +5,11 @@ BlueKing Container Service (BCS) is a container management and orchestration platform for the micro-services under the BlueKing ecosystem. -BlueKing Container Service provides a two-engine-driven container orchestration scheme based on native Kubernetes and mesos `bk-framework`, and users can choose to either one of them to orchestrate their own applications. The Kubernetes method is mainly based on Kubernetes solution. In addition to providing native functional support, it also provide the seamless integration of native Kubernetes and BlueKing platform. Users can experience container technology with Kubernetes community edition in the BlueKing platform in a way that is indistinguishable and convenient. The mesos+bk-framwork solution is a container orchestration program for BlueKing that capable for customization. If you need to create a highly personalized container platform for special application scenarios, the mesos `bk-framework` solution is a great choice. +BlueKing Container Service provides a two-engine-driven container orchestration scheme based on native Kubernetes and mesos `bk-framework`, and users can choose to either one of them to orchestrate their own applications. The Kubernetes method is mainly based on Kubernetes solution. In addition to providing native functional support, it also provides seamless integration between the native Kubernetes cluster and the BlueKing platform. Users can experience container technology with Kubernetes community edition in the BlueKing platform in a way that is indistinguishable and convenient. The mesos `bk-framwork` solution is a container orchestration program for BlueKing that capable of customization. If you need to create a highly personalized container platform for special application scenarios, the mesos `bk-framework` solution is a great choice. -In addition to the orchestration program, the BlueKIng Container Service also provides an indiscriminate service management solution to provide services such as service registration, service discovery, load balancing, DNS, and traffic proxies. +In addition to the orchestration program, the BlueKing Container Service also provides an abstract service management solution to provide services such as load balancing, service registration, service discovery, DNS, and traffic proxies. -The open source version is consistent with the BlueKing Container Management Platform version of the BlueKing Community Edition and is updated synchronously. BlueKing community Edition will have a built-in SaaS(Software As A Service) to communicate with BCS, this will provide users with interface to view container operations. +The open source version of the BlueKing Container Service is consistent with the BlueKing Community Edition and is updated synchronously. BlueKing Community Edition will have a built-in SaaS (Software As A Service) to communicate with BCS, this will provide users with interface to view container operations. ## Overview @@ -22,7 +22,7 @@ The open source version is consistent with the BlueKing Container Management Pla * Support for dual engine orchestration based on Kubernetes and Mesos * Support multi-cluster management * Support plug-in custom orchestration scheduling strategy -* Support service upgrade, expansion and expansion, rolling upgrade, blue and green release, etc. +* Support service upgrade, expansion and expansion, rolling upgrade, blue/green deploy strategy, etc. * Support configmap, secret, disk volume mount, shared disk mount, etc. * Support basic service management solutions such as service discovery, domain name resolution, and access agents, etc * Support for scalable resource quota definitions @@ -43,12 +43,12 @@ For a detailed description of the above features, please refer to the BlueKing C ## Contributing -Interested in the project, and want to contribute and improve the project together, please refer to [contributing](./CONTRIBUTING.md). -[Tencent Open Source Incentive Program](https://opensource.tencent.com/contribution) Encourage developers to participate and contribute, and look forward to your joining us. +If you are interested in this project and want to contribute and improve the project together, please refer to [contributing](./CONTRIBUTING.md). +[Tencent Open Source Incentive Program](https://opensource.tencent.com/contribution) We encourage developers to participate and contribute, and look forward to your joining us. ## Support -* Refer to bk-bcs [installation documentation] (docs/install/deploy-guide.md) +* Refer to `bk-bcs`[installation documentation](docs/install/deploy-guide.md) * Read [source code](https://github.com/Tencent/bk-bcs) * Read [wiki](https://github.com/Tencent/bk-bcs/wiki) or ask for help * Learn about the BlueKing Community: Wechat search 蓝鲸社区版交流群 From cbc56ff705f8d791fdf5781323bb775d34ca8d64 Mon Sep 17 00:00:00 2001 From: Lwxiang Date: Tue, 25 Jun 2019 11:31:40 +0800 Subject: [PATCH 08/13] fix: godeps recursive by Sirupsen, issue #0 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4bd367708a..fa189a9328 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,7 @@ pre: mkdir -p ${CONFPATH} mkdir -p ${EXPORTPATH} cp -R ./install/cmd/conf/* ${CONFPATH}/ - cd ./vendor/github.com && ln -sf Sirupsen sirupsen && cd - + cd ./vendor/github.com && [[ ! -d sirupsen ]] && ln -sf Sirupsen sirupsen api:pre go build ${LDFLAG} -o ${BINARYPATH}/bcs-api ./bcs-services/bcs-api/main.go From bbada70f1c8459bcc582cba7e5008e1cb160dd70 Mon Sep 17 00:00:00 2001 From: roby Date: Fri, 10 May 2019 17:51:43 +0800 Subject: [PATCH 09/13] add english logo en logo --- docs/logo/logo_en.png | Bin 0 -> 7573 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 docs/logo/logo_en.png diff --git a/docs/logo/logo_en.png b/docs/logo/logo_en.png new file mode 100644 index 0000000000000000000000000000000000000000..d5746e3050999ae19de2f3559cd5379d4aed4095 GIT binary patch literal 7573 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 V&J%j>cyLk!fNHv`4Jx+p{tsqNW*Pth literal 0 HcmV?d00001 From 86be08aefc3542aadf08bbe0018b0a2c9965d54d Mon Sep 17 00:00:00 2001 From: Lwxiang Date: Tue, 25 Jun 2019 12:03:09 +0800 Subject: [PATCH 10/13] fix: adjust sirupsen link creation, issue #0 --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index fa189a9328..3a82821a35 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,8 @@ pre: mkdir -p ${CONFPATH} mkdir -p ${EXPORTPATH} cp -R ./install/cmd/conf/* ${CONFPATH}/ - cd ./vendor/github.com && [[ ! -d sirupsen ]] && ln -sf Sirupsen sirupsen + if [[ ! -d ./vendor/github.com/sirupsen ]]; then ln -sf ./vendor/github.com/Sirupsen ./vendor/github.com/sirupsen; fi + if [[ ! -d ./vendor/github.com/Sirupsen ]]; then ln -sf ./vendor/github.com/sirupsen ./vendor/github.com/Sirupsen; fi api:pre go build ${LDFLAG} -o ${BINARYPATH}/bcs-api ./bcs-services/bcs-api/main.go From 9216945f19757edc1d3100a2a683f50386cd1f4e Mon Sep 17 00:00:00 2001 From: DeveloperJim <190177081@qq.com> Date: Wed, 26 Jun 2019 11:49:40 +0800 Subject: [PATCH 11/13] docs: add english readme, issue #20 --- README.md | 73 ++++++++++++++++++++++++---------------------------- README_cn.md | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++ README_en.md | 63 --------------------------------------------- 3 files changed, 106 insertions(+), 102 deletions(-) create mode 100644 README_cn.md delete mode 100644 README_en.md diff --git a/README.md b/README.md index 1490338f84..151bcbec01 100644 --- a/README.md +++ b/README.md @@ -1,64 +1,59 @@ -![蓝鲸容器管理平台.png](./docs/logo/bcs_zh.png) +![BCS.png](./docs/logo/logo_en.png) --- -[![license](https://img.shields.io/badge/license-mit-brightgreen.svg?style=flat)](https://github.com/Tencent/bk-bcs/blob/master/LICENSE)[![Release Version](https://img.shields.io/badge/release-1.12.x-brightgreen.svg)](https://github.com/Tencent/bk-bcs/releases) ![BK Pipelines Status](https://api.bkdevops.qq.com/process/api/external/pipelines/projects/bcs/p-95397dbecda4442795dd0125a33069cb/badge?X-DEVOPS-PROJECT-ID=bcs) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/bk-bcs/pulls) -蓝鲸容器管理平台（Blueking Container Service，简称BCS）是蓝鲸体系下，以容器技术为基础，为微服务业务提供编排管理的基础服务平台。 +[![license](https://img.shields.io/badge/license-mit-brightgreen.svg?style=flat)](https://github.com/Tencent/bk-bcs/blob/master/LICENSE)[![Release Version](https://img.shields.io/badge/release-1.12.x-brightgreen.svg)](https://github.com/Tencent/bk-bcs/releases) ![BK Pipelines Status](https://api.bkdevops.qq.com/process/api/external/pipelines/projects/bcs/p-c03c759b697f494ab14e01018eccb052/badge?X-DEVOPS-PROJECT-ID=bcs) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/bk-bcs/pulls) -蓝鲸容器管理平台提供了基于原生k8s和mesos+bk-framework的双引擎驱动的容器编排方案，用户可以选择使用其中一种来编排自己的应用。其中k8s方式以社区方案为主，除提供原生功能支持外，还实现了原生k8s与蓝鲸体系的无缝结合，用户可以在蓝鲸体系下以与传统无差异的方式体验容器技术和k8s社区带来的便利。mesos+bk-framwork方案是蓝鲸为需要深度定制的用户准备的可进行二次开发的容器编排方案，如果你需要打造极具个性化，需要面向特殊应用场景的容器平台，mesos+bk-framework方案是不二选择。 +[中文文档](./README.md) -除编排方案外，蓝鲸容器管理平台还提供了无差异的服务治理方案，为业务提供服务注册与服务发现、负载均衡、DNS、流量代理等服务。 +BlueKing Container Service (BCS) is a container management and orchestration platform for the micro-services under the BlueKing ecosystem. -本次开源的版本，与蓝鲸社区版中的蓝鲸容器管理平台版本保持一致并且同步更新。并且蓝鲸社区版内会有内置的SaaS对接蓝鲸容器管理平台，为用户提供容器编排的界面化操作。 +BlueKing Container Service provides a two-engine-driven container orchestration scheme based on native Kubernetes and mesos `bk-framework`, and users can choose to either one of them to orchestrate their own applications. The Kubernetes method is mainly based on Kubernetes solution. In addition to providing native functional support, it also provides seamless integration between the native Kubernetes cluster and the BlueKing platform. Users can experience container technology with Kubernetes community edition in the BlueKing platform in a way that is indistinguishable and convenient. The mesos `bk-framwork` solution is a container orchestration program for BlueKing that capable of customization. If you need to create a highly personalized container platform for special application scenarios, the mesos `bk-framework` solution is a great choice. + +In addition to the orchestration program, the BlueKing Container Service also provides an abstract service management solution to provide services such as load balancing, service registration, service discovery, DNS, and traffic proxies. + +The open source version of the BlueKing Container Service is consistent with the BlueKing Community Edition and is updated synchronously. BlueKing Community Edition will have a built-in SaaS (Software As A Service) to communicate with BCS, this will provide users with interface to view container operations. ## Overview -* [架构设计](./docs/overview/architecture.md) -* [代码结构](./docs/overview/code_directory.md) -* [功能说明](./docs/overview/function.md) +* [Architecture Design](./docs/overview/architecture.md) +* [code structure](./docs/overview/code_directory.md) +* [Function Description](./docs/overview/function.md) ## Features -* 支持基于k8s和Mesos双引擎编排 -* 支持多集群管理 -* 支持插件化自定义编排调度策略 -* 支持服务升级，扩缩容，滚动升级，蓝绿发布等 -* 支持configmap，secret，磁盘卷挂载，共享盘挂载等 -* 支持服务发现，域名解析，访问代理等基础服务治理方案 -* 支持可扩展的资源配额定义 -* 支持容器内IPC机制 -* 支持多种容器网络方案 +* Support for dual engine orchestration based on Kubernetes and Mesos +* Support multi-cluster management +* Support plug-in custom orchestration scheduling strategy +* Support service upgrade, expansion and expansion, rolling upgrade, blue/green deploy strategy, etc. +* Support configmap, secret, disk volume mount, shared disk mount, etc. +* Support basic service management solutions such as service discovery, domain name resolution, and access agents, etc +* Support for scalable resource quota definitions +* Support in-container IPC mechanism +* Support multiple container network solutions (CNI) -如果想了解以上功能的详细说明，请参考蓝鲸容器管理平台[白皮书](https://docs.bk.tencent.com/bcs/) +For a detailed description of the above features, please refer to the BlueKing Container Management Platform [white paper](https://docs.bk.tencent.com/bcs/) ## Getting Started -> 容器管理平台是蓝鲸智云社区版V5.1以上推出的产品，后台服务可以独立部署与使用。如果需要SaaS的支持，则需要与蓝鲸社区版软件配合使用。 - -> 目前社区版5.1在灰度内测中，若想体验，请填写问卷留下邮箱等信息，蓝鲸将在1-2个工作日通过邮箱方式，交付软件。感谢对蓝鲸的支持与理解。 -> 问卷链接：[https://wj.qq.com/s2/3830461/a8bc/](https://wj.qq.com/s2/3830461/a8bc/) - -> 蓝鲸社区版5.1完全开放下载时间为2019-07-05 - -* [下载与编译](docs/install/source_compile.md) -* [安装部署](docs/install/deploy-guide.md) -* [API使用说明](./docs/apidoc/api.md) +* [Download and Compile](docs/install/source_compile.md) +* [Installation Deployment](docs/install/deploy-guide.md) +* [API Usage Notes](./docs/apidoc/api.md) ## Version Plan -* [版本详情](./docs/version/README.md) +* [Version Details](./docs/version/README.md) ## Contributing -对于项目感兴趣，想一起贡献并完善项目请参阅[contributing](./CONTRIBUTING.md)。 - -[腾讯开源激励计划](https://opensource.tencent.com/contribution) 鼓励开发者的参与和贡献，期待你的加入。 +If you are interested in this project and want to contribute and improve the project together, please refer to [contributing](./CONTRIBUTING.md). +[Tencent Open Source Incentive Program](https://opensource.tencent.com/contribution) We encourage developers to participate and contribute, and look forward to your joining us. ## Support -* 参考bk-bcs[安装文档](docs/install/deploy-guide.md) -* 阅读 [源码](https://github.com/Tencent/bk-bcs) -* 阅读 [wiki](https://github.com/Tencent/bk-bcs/wiki) 或者寻求帮助 -* 了解蓝鲸社区相关信息：蓝鲸社区版交流QQ群 495299374 -* 直接反馈issue，我们会定期查看与答复 +* Refer to `bk-bcs`[installation documentation](docs/install/deploy-guide.md) +* Read [source code](https://github.com/Tencent/bk-bcs) +* Read [wiki](https://github.com/Tencent/bk-bcs/wiki) or ask for help +* Learn about the BlueKing Community: QQ group 495299374 +* Issues, we will check and reply regularly ## FAQ @@ -66,4 +61,4 @@ ## License -bk-bcs是基于MIT协议， 详细请参考[LICENSE](./LICENSE.TXT)。 +Bk-bcs is based on the MIT protocol. Please refer to [LICENSE](./LICENSE.TXT) for details. diff --git a/README_cn.md b/README_cn.md new file mode 100644 index 0000000000..e40295e58a --- /dev/null +++ b/README_cn.md @@ -0,0 +1,72 @@ +![蓝鲸容器管理平台.png](./docs/logo/bcs_zh.png) +--- +[![license](https://img.shields.io/badge/license-mit-brightgreen.svg?style=flat)](https://github.com/Tencent/bk-bcs/blob/master/LICENSE)[![Release Version](https://img.shields.io/badge/release-1.12.x-brightgreen.svg)](https://github.com/Tencent/bk-bcs/releases) ![BK Pipelines Status](https://api.bkdevops.qq.com/process/api/external/pipelines/projects/bcs/p-c03c759b697f494ab14e01018eccb052/badge?X-DEVOPS-PROJECT-ID=bcs) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/bk-bcs/pulls) + +[EnglishDocs](./README_en.md) + +蓝鲸容器管理平台（Blueking Container Service，简称BCS）是蓝鲸体系下，以容器技术为基础，为微服务业务提供编排管理的基础服务平台。 + +蓝鲸容器管理平台提供了基于原生k8s和mesos+bk-framework的双引擎驱动的容器编排方案，用户可以选择使用其中一种来编排自己的应用。其中k8s方式以社区方案为主，除提供原生功能支持外，还实现了原生k8s与蓝鲸体系的无缝结合，用户可以在蓝鲸体系下以与传统无差异的方式体验容器技术和k8s社区带来的便利。mesos+bk-framwork方案是蓝鲸为需要深度定制的用户准备的可进行二次开发的容器编排方案，如果你需要打造极具个性化，需要面向特殊应用场景的容器平台，mesos+bk-framework方案是不二选择。 + +除编排方案外，蓝鲸容器管理平台还提供了无差异的服务治理方案，为业务提供服务注册与服务发现、负载均衡、DNS、流量代理等服务。 + +本次开源的版本，与蓝鲸社区版中的蓝鲸容器管理平台版本保持一致并且同步更新。并且蓝鲸社区版内会有内置的SaaS对接蓝鲸容器管理平台，为用户提供容器编排的界面化操作。 + +## Overview + +* [架构设计](./docs/overview/architecture.md) +* [代码结构](./docs/overview/code_directory.md) +* [功能说明](./docs/overview/function.md) + +## Features + +* 支持基于k8s和Mesos双引擎编排 +* 支持多集群管理 +* 支持插件化自定义编排调度策略 +* 支持服务升级，扩缩容，滚动升级，蓝绿发布等 +* 支持configmap，secret，磁盘卷挂载，共享盘挂载等 +* 支持服务发现，域名解析，访问代理等基础服务治理方案 +* 支持可扩展的资源配额定义 +* 支持容器内IPC机制 +* 支持多种容器网络方案 + +如果想了解以上功能的详细说明，请参考蓝鲸容器管理平台[白皮书](https://docs.bk.tencent.com/bcs/) + +## Getting Started + +> 容器管理平台是蓝鲸智云社区版V5.1以上推出的产品，后台服务可以独立部署与使用。如果需要SaaS的支持，则需要与蓝鲸社区版软件配合使用。 + +> 目前社区版5.1在灰度内测中，若想体验，请填写问卷留下邮箱等信息，蓝鲸将在1-2个工作日通过邮箱方式，交付软件。感谢对蓝鲸的支持与理解。 +> 问卷链接：[https://wj.qq.com/s2/3830461/a8bc/](https://wj.qq.com/s2/3830461/a8bc/) + +> 蓝鲸社区版5.1完全开放下载时间为2019-07-05 + +* [下载与编译](docs/install/source_compile.md) +* [安装部署](docs/install/deploy-guide.md) +* [API使用说明](./docs/apidoc/api.md) + +## Version Plan + +* [版本详情](./docs/version/README.md) + +## Contributing + +对于项目感兴趣，想一起贡献并完善项目请参阅[contributing](./CONTRIBUTING.md)。 + +[腾讯开源激励计划](https://opensource.tencent.com/contribution) 鼓励开发者的参与和贡献，期待你的加入。 + +## Support + +* 参考bk-bcs[安装文档](docs/install/deploy-guide.md) +* 阅读 [源码](https://github.com/Tencent/bk-bcs) +* 阅读 [wiki](https://github.com/Tencent/bk-bcs/wiki) 或者寻求帮助 +* 了解蓝鲸社区相关信息：蓝鲸社区版交流QQ群 495299374 +* 直接反馈issue，我们会定期查看与答复 + +## FAQ + +[https://github.com/Tencent/bk-bcs/wiki/FAQ](https://github.com/Tencent/bk-bcs/wiki/FAQ) + +## License + +bk-bcs是基于MIT协议， 详细请参考[LICENSE](./LICENSE.TXT)。 diff --git a/README_en.md b/README_en.md deleted file mode 100644 index d1fedbe82f..0000000000 --- a/README_en.md +++ /dev/null @@ -1,63 +0,0 @@ -![BCS.png](./docs/logo/logo_en.png) ---- -[![license](https://img.shields.io/badge/license-mit-brightgreen.svg?style=flat)](https://github.com/Tencent/bk-bcs/blob/master/LICENSE)[![Release Version](https://img.shields.io/badge/release-1.12.0-brightgreen.svg)](https://github.com/Tencent/bk-bcs/releases)[![Build Status](https://travis-ci.org/Tencent/bk-bcs.svg?branch=master)](https://travis-ci.org/Tencent/bk-bcs)[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/bk-bcs/pulls) - - -BlueKing Container Service (BCS) is a container management and orchestration platform for the micro-services under the BlueKing ecosystem. - -BlueKing Container Service provides a two-engine-driven container orchestration scheme based on native Kubernetes and mesos `bk-framework`, and users can choose to either one of them to orchestrate their own applications. The Kubernetes method is mainly based on Kubernetes solution. In addition to providing native functional support, it also provides seamless integration between the native Kubernetes cluster and the BlueKing platform. Users can experience container technology with Kubernetes community edition in the BlueKing platform in a way that is indistinguishable and convenient. The mesos `bk-framwork` solution is a container orchestration program for BlueKing that capable of customization. If you need to create a highly personalized container platform for special application scenarios, the mesos `bk-framework` solution is a great choice. - -In addition to the orchestration program, the BlueKing Container Service also provides an abstract service management solution to provide services such as load balancing, service registration, service discovery, DNS, and traffic proxies. - -The open source version of the BlueKing Container Service is consistent with the BlueKing Community Edition and is updated synchronously. BlueKing Community Edition will have a built-in SaaS (Software As A Service) to communicate with BCS, this will provide users with interface to view container operations. - -## Overview - -* [Architecture Design](./docs/overview/architecture.md) -* [code structure](./docs/overview/code_directory.md) -* [Function Description](./docs/overview/function.md) - -## Features - -* Support for dual engine orchestration based on Kubernetes and Mesos -* Support multi-cluster management -* Support plug-in custom orchestration scheduling strategy -* Support service upgrade, expansion and expansion, rolling upgrade, blue/green deploy strategy, etc. -* Support configmap, secret, disk volume mount, shared disk mount, etc. -* Support basic service management solutions such as service discovery, domain name resolution, and access agents, etc -* Support for scalable resource quota definitions -* Support in-container IPC mechanism -* Support multiple container network solutions (CNI) - -For a detailed description of the above features, please refer to the BlueKing Container Management Platform [white paper](https://bk.tencent.com/docs/) - -## Getting Started - -* [Download and Compile](docs/install/source_compile.md) -* [Installation Deployment](docs/install/deploy-guide.md) -* [API Usage Notes](./docs/apidoc/api.md) - -## Version Plan - -* [Version Details](./docs/version/README.md) - -## Contributing - -If you are interested in this project and want to contribute and improve the project together, please refer to [contributing](./CONTRIBUTING.md). -[Tencent Open Source Incentive Program](https://opensource.tencent.com/contribution) We encourage developers to participate and contribute, and look forward to your joining us. - -## Support - -* Refer to `bk-bcs`[installation documentation](docs/install/deploy-guide.md) -* Read [source code](https://github.com/Tencent/bk-bcs) -* Read [wiki](https://github.com/Tencent/bk-bcs/wiki) or ask for help -* Learn about the BlueKing Community: Wechat search 蓝鲸社区版交流群 -* Contact us, technical exchange via QQ group: - -## FAQ - -[https://github.com/Tencent/bk-bcs/wiki/FAQ](https://github.com/Tencent/bk-bcs/wiki/FAQ) - -## License - -Bk-bcs is based on the MIT protocol. Please refer to [LICENSE](./LICENSE.TXT) for details. From f51a14a40fee71f026a17050e6e1dc8825a38876 Mon Sep 17 00:00:00 2001 From: DeveloperJim <190177081@qq.com> Date: Wed, 26 Jun 2019 11:52:29 +0800 Subject: [PATCH 12/13] docs: fix cn link, issue #20 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 151bcbec01..bdd36218a3 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ --- [![license](https://img.shields.io/badge/license-mit-brightgreen.svg?style=flat)](https://github.com/Tencent/bk-bcs/blob/master/LICENSE)[![Release Version](https://img.shields.io/badge/release-1.12.x-brightgreen.svg)](https://github.com/Tencent/bk-bcs/releases) ![BK Pipelines Status](https://api.bkdevops.qq.com/process/api/external/pipelines/projects/bcs/p-c03c759b697f494ab14e01018eccb052/badge?X-DEVOPS-PROJECT-ID=bcs) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/bk-bcs/pulls) -[中文文档](./README.md) +[中文文档](./README_cn.md) BlueKing Container Service (BCS) is a container management and orchestration platform for the micro-services under the BlueKing ecosystem. From ce80c1cf222b2664cf1812e1a95bb02ac1440d88 Mon Sep 17 00:00:00 2001 From: DeveloperJim <190177081@qq.com> Date: Wed, 26 Jun 2019 11:53:27 +0800 Subject: [PATCH 13/13] docs: fix en link, issue #20 --- README_cn.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_cn.md b/README_cn.md index e40295e58a..f5eef048ea 100644 --- a/README_cn.md +++ b/README_cn.md @@ -2,7 +2,7 @@ --- [![license](https://img.shields.io/badge/license-mit-brightgreen.svg?style=flat)](https://github.com/Tencent/bk-bcs/blob/master/LICENSE)[![Release Version](https://img.shields.io/badge/release-1.12.x-brightgreen.svg)](https://github.com/Tencent/bk-bcs/releases) ![BK Pipelines Status](https://api.bkdevops.qq.com/process/api/external/pipelines/projects/bcs/p-c03c759b697f494ab14e01018eccb052/badge?X-DEVOPS-PROJECT-ID=bcs) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/bk-bcs/pulls) -[EnglishDocs](./README_en.md) +[EnglishDocs](./README.md) 蓝鲸容器管理平台（Blueking Container Service，简称BCS）是蓝鲸体系下，以容器技术为基础，为微服务业务提供编排管理的基础服务平台。