From 9fe9c358ddf447c6e6c28f29ceadf72fc5bf6606 Mon Sep 17 00:00:00 2001 From: FeynmanZhou Date: Tue, 26 May 2020 17:46:31 +0800 Subject: [PATCH 1/7] refine README Signed-off-by: FeynmanZhou --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b7e7248cd..a8740d1a8 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ -# website -kubesphere website +# Website + +This project uses [Hugo](https://gohugo.io/) to build the new website for KubeSphere. ## Contribute @@ -24,6 +25,8 @@ When you have installed Hugo, then run: hugo server -D ``` +Now you can preview the website in your browser using `http://localhost:1313/`. + ### Open a pull request Open a [pull request (PR)](https://help.github.com/en/desktop/contributing-to-projects/creating-an-issue-or-pull-request#creating-a-new-pull-request) to add a localization to the repository. From bc8f567535569f2445788908a813bca54d6b6ba5 Mon Sep 17 00:00:00 2001 From: sherlockxu Date: Wed, 27 May 2020 14:19:10 +0800 Subject: [PATCH 2/7] English Homepage Update: grammar and spelling check --- content/en/_index.md | 60 ++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/content/en/_index.md b/content/en/_index.md index f04a56993..cb5205e73 100644 --- a/content/en/_index.md +++ b/content/en/_index.md @@ -8,25 +8,25 @@ css: scss/index.scss section1: title: KubeSphere Container Platform topic: The Kubernetes Platform, tailored for the hybrid cloud - content: KubeSphere is a distributed operating system providing cloud native stack with Kubernetes as its kernel, and aims to be plug-and-play architecture for third-party applications seamless integration to boost its ecosystem. + content: KubeSphere is a distributed operating system providing cloud native stacks with Kubernetes as its kernel, and aims to create a plug-and-play architecture for third-party applications for seamless integration to boost its ecosystem. btnContent1: Install on Kubernetes btnContent2: Install on Linux section2: title: One Platform for full-stack solutions - content: KubeSphere is also a multi-tenant enterprise-grade container platform with full-stack automated IT operation and streamlined DevOps workflows. It provides developer-friendly wizard web UI, helping enterprises to build out a more robust and feature-rich platform, which includes most common functionalities needed for enterprise Kubernetes strategy.， + content: KubeSphere is also a multi-tenant enterprise-grade container platform with full-stack automated IT operation and streamlined DevOps workflows. It provides developer-friendly wizard web UI, helping enterprises to build out a more robust and feature-rich platform, which includes the most common functionalities needed for enterprise Kubernetes strategies. children: - name: Open Source icon: /images/home/open-source.svg - content: A CNCF certified Kubernetes platform, 100% open source, built and improved by the community + content: A CNCF-certified Kubernetes platform, 100% open source, built and improved by the community - name: Easy to Run icon: /images/home/easy-to-run.svg - content: Can be deployed on a Kubernetes cluster or Linux machines, supports online and air-gapped installation + content: Can be deployed on a Kubernetes cluster or Linux machines and support online and air-gapped installation - name: Feature-rich icon: /images/home/feature-rich.svg - content: Delivers DevOps, service mesh, observability, application management, multi-tenancy, storage and networking management in an unified platform + content: Deliver DevOps, service mesh, observability, application management, multi-tenancy, storage and networking management in an unified platform - name: Modular & Pluggable icon: /images/home/modular-pluggable.svg @@ -36,7 +36,7 @@ section2: section3: title: Benefits to different teams - content: Multi-tenancy makes different teams to securely deploy and maintain containerized applications from the cloud to the edge. It allows developers to deploy code via several clicks on intuitive console, brings centralized observability and powerful DevOps strategy for Ops team, helps Infra team to install and maintain Kubernetes cluster with flexible network and solution solutions, avoid locking team in to a single vendor eco-system. + content: Multi-tenancy enables different teams to securely deploy and maintain containerized applications from the cloud to the edge. It allows developers to deploy code via several clicks on intuitive consoles, brings centralized observability and powerful DevOps strategies for the Ops team, helps the Infra team to install and maintain Kubernetes cluster with flexible network and efficient solutions, and avoids locking teams into a single-vendor ecosystem. children: - name: Infra Team content: Automated installation, scaling, and upgrades from cloud to data center @@ -44,83 +44,83 @@ section3: children: - content: Improve your environment utilization and reduce internal infrastructure costs - content: Support multi-cluster and multi-cloud Kubernetes management, avoiding vendor lock-in - - content: Provides security enhancements, supports multiple storage and network solutions - - content: Fully trusted, delivers a certified Kubernetes platform and distribution + - content: Provide security enhancements, multiple storage and network solutions + - content: Deliver a trustworthy and certified Kubernetes platform and distribution - name: Developers - content: Focus on your bussiness, others are run in automated tools + content: Focus on your business as automation tools do the rest icon: /images/home/74.png children: - - content: Smooth user experience, reduce the learning curve of the cloud native stack + - content: Create a smooth user experience and reduce the learning curve of the cloud native stack - content: Provide toolkits and deployment automation tailored to any application environment - - content: Out-of-box logging, monitoring and multi-tenancy, improving development efficiency + - content: Offer out-of-box logging, monitoring and multi-tenancy functions, improving development efficiency - content: Support application lifecycle management, accelerating time to market - name: Ops Team - content: Building one-stop enterprise-grade DevOps framework + content: Build a one-stop enterprise-grade DevOps framework icon: /images/home/71.svg children: - - content: Centralized log collection, monitoring and alerting from infrastructure to applications. - - content: Streamlined continuous deploy, test, release, upgrade and scale - - content: Better track, route and optimize communications within Kubernetes for cloud native apps - - content: Easy-to-use web terminal and graphical panel, satisfying the habits of different users + - content: Centralized log collection, monitoring and alerting from infrastructure to applications + - content: Streamlined process of continuous deployment, test, release, upgrade and scaling + - content: Better tracking, routing and optimized communications within Kubernetes for cloud native apps + - content: Easy-to-use web terminal and graphical panel, satisfying the needs of different users section4: title: Key Features - content: If you want to use an open source project, but act like a commercial product, KubeSphere is your choice.
The Roadmap listed the planning features, you can raise a proposal to submit your ideas with us. + content: If you are seeking for an open source project that also provides commercial products, KubeSphere is your choice.
The Roadmap lists planned features and you can raise a proposal to contribute your ideas to the community. children: - name: Provisioning Kubernetes icon: /images/home/provisioning-kubernetes.svg - content: Deploy Kubernetes on any infrastructure out of box, including online and air-gapped installation, support add GPU node + content: Deploy Kubernetes on any infrastructure out of box, including online and air-gapped installation, and support adding GPU nodes - name: K8s Resource Management icon: /images/home/k-8-s-resource-management.svg - content: Provide web console for creating and managing Kubernetes resources, with powerful observability + content: Provide a web console for creating and managing Kubernetes resources, with powerful observability - name: Multi-tenant Management icon: /images/home/multi-tenant-management.svg - content: Provide unified authentication with fine-grained roles and three-tier authorization system, supports AD/LDAP authentication + content: Provide unified authentication with fine-grained roles and three-tier authorization system, and support AD/LDAP authentication features: - name: Application Store icon: /images/home/store.svg - content: Provide application store for Helm-based applications, and offers application lifecycle management + content: Provide an application store for Helm-based applications, and offer application lifecycle management color: grape - name: Service Mesh (Istio-based) icon: /images/home/service.svg - content: Provide fine-grained traffic management, observability and tracing, and offers visualization for traffic topology + content: Provide fine-grained traffic management, observability and tracing, and offer visualization for traffic topology color: red - name: Rich Observability icon: /images/home/rich.svg - content: Multi-dimensional monitoring metrics, multi-tenant log query and collection, support alerting and notification + content: Multi-dimensional monitoring metrics, multi-tenant log query and collection, and alerting and notification support color: green - name: DevOps System icon: /images/home/dev-ops.svg - content: Out-of-box CI/CD based on Jenkins, and offers automated workflow tools including S2I & B2I + content: Out-of-box CI/CD based on Jenkins, and automated workflow tools including S2I & B2I color: orange - name: Multiple Storage Solutions icon: /images/home/multiple.svg - content: Support GlusterFS, CephRBD, NFS, LocalPV solutions, provide CSI plugins to consume storage from multiple cloud providers + content: Support GlusterFS, CephRBD, NFS, LocalPV solutions, and provide CSI plugins to consume storage from multiple cloud providers color: grape - name: Multiple Network Solutions icon: /images/home/network.svg - content: Support Calico and Flannel, provides load balancer plug-in Porter for Kubernetes installed on physical machines + content: Support Calico and Flannel, and provide load balancer plug-in Porter for Kubernetes installed on physical machines color: green - name: Multi-cluster management icon: /images/home/management.svg - content: Distribute applications across multiple clusters and cloud providers, and provides the disaster recovery and cross-cluster discovery. + content: Distribute applications across multiple clusters and cloud providers, and provide disaster recovery plans and cross-cluster discovery color: orange section5: title: KubeSphere with its cloud native architecture frontEnd: - title: Front end + title: Front End project: KubeSphere Console children: - icon: /images/home/mobx.jpg @@ -128,7 +128,7 @@ section5: - icon: /images/home/react.png backEnd: - title: Back end （REST API） + title: Back End (REST API) project: KubeSphere System group: - name: API Server @@ -139,7 +139,7 @@ section5: section6: title: Who uses KubeSphere - content: The Case Studies listed more detailed user cases and their cloud native transformation stories.
Various enterprises and organizations use KubeSphere Container Platform for research, production and commercial products. + content: The Case Studies list more detailed user cases and their cloud native transformation stories.
Various enterprises and organizations use KubeSphere Container Platform for research, production and commercial products. children: - icon: /images/home/section6-1.jpg - icon: /images/home/section6-2.jpg From b204cbb06d7c6214d2ca4ab60cf94b5a5944d479 Mon Sep 17 00:00:00 2001 From: Ray Zhou Date: Wed, 27 May 2020 15:26:09 +0800 Subject: [PATCH 3/7] Update license info --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 261eeb9e9..cd92c18de 100644 --- a/LICENSE +++ b/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright [yyyy] [name of copyright owner] + Copyright 2018-2020 KubeSphere Authors Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From 8b28387de763d41a3263704aa95c7b3f13dfddf4 Mon Sep 17 00:00:00 2001 From: sherlockxu Date: Wed, 27 May 2020 15:36:32 +0800 Subject: [PATCH 4/7] Contribution English Page review --- content/en/contribution/_index.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/content/en/contribution/_index.md b/content/en/contribution/_index.md index 6bc5bd4fe..5389bc4e6 100644 --- a/content/en/contribution/_index.md +++ b/content/en/contribution/_index.md @@ -5,7 +5,7 @@ css: "scss/contribution.scss" section1: title: 'Community is the Soul of KubeSphere' - content: 'Join the community to get help, get involved, or to get updates and KubeSphere news!' + content: 'Join the community to get help, get involved, or get updates and KubeSphere news!' topImage: "images/contribution/contribution-top.jpg" section2: @@ -44,7 +44,7 @@ section2: link: '' organization: - topic: 'Community Organization' + topic: 'Community Framework' name: 'KubeSphere Community' icon: 'images/contribution/28.svg' topIcon: 'images/contribution/8.svg' @@ -56,7 +56,7 @@ section2: icon: 'images/contribution/developer-group.svg' children: - name: 'Owner / Lead' - content: 'A lead is also the member of the project who is an experienced and acrive reciewer of the project.' + content: 'A lead is also a member of the project who is an experienced and active reviewer of the project.' - name: 'Member' content: 'A lead is also the member of the project who is an experienced and acrive reciewer of the project.' @@ -80,7 +80,7 @@ section2: section3: interestGroup: title: 'Find Your Special Interest Group' - content: 'SIGs are designed to let you can find everything you need in one place around a central topic. Find your commonality and join the SIG.' + content: 'SIGs are designed to let you find everything you need in one place around a central topic. Find an interesting one and join the SIG.' children: - name: 'Apps' icon: '/images/contribution/apps.svg' @@ -93,7 +93,7 @@ section3: - icon: '/images/contribution/calicq2.jpg' - icon: '/images/contribution/calicq3.jpg' - - name: 'App store' + - name: 'App Store' icon: '/images/contribution/app-store.svg' iconActive: '/images/contribution/app-store-active.svg' content: '' @@ -113,7 +113,7 @@ section3: children: - icon: '' - - name: 'Cloud-Providers' + - name: 'Cloud Providers' icon: '/images/contribution/cloud-providers.svg' iconActive: '/images/contribution/cloud-providers-active.svg' content: '' @@ -190,7 +190,7 @@ section3: - icon: '' - icon: '' - - name: 'Multicluster' + - name: 'Multi-cluster' icon: '/images/contribution/multicluster.svg' iconActive: '/images/contribution/multicluster-active.svg' content: '' @@ -201,7 +201,7 @@ section3: - icon: '' - icon: '' - - name: 'Multitenancy' + - name: 'Multi-tenancy' icon: '/images/contribution/multitenancy.svg' iconActive: '/images/contribution/multitenancy-active.svg' content: '' @@ -269,17 +269,17 @@ section3: section4: involved: - title: 'Get involved' + title: 'Get Involved' children: - title: 'Be a Champion' icon: 'images/contribution/group-1.png' - content: 'Join me tomorrow and start putting in the time to get your campaign ready with a landing page!' + content: 'Join me tomorrow and start to get your campaign ready with a landing page!' link: '' linkContent: 'Become a KubeSphere Champion →' - title: 'Be a Member' icon: 'images/contribution/group-2.png' - content: 'KubeSphere is 100% open source and driven by community,we appreciate contributions to our code and documentation!Significant contributions will earn you a contributor t-shirt.' + content: 'KubeSphere is 100% open source and driven by the community. We appreciate contributions to our code and documentation! Significant contributions will earn you a contributor T-shirt.' link: '' linkContent: 'Become a KubeSphere Member →' --- \ No newline at end of file From 603fd6fbce060c4587b4de52fa3b126cf5986ac5 Mon Sep 17 00:00:00 2001 From: sherlockxu Date: Wed, 27 May 2020 17:12:51 +0800 Subject: [PATCH 5/7] Homepage EN Update --- content/en/_index.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/content/en/_index.md b/content/en/_index.md index cb5205e73..bdb1c821c 100644 --- a/content/en/_index.md +++ b/content/en/_index.md @@ -8,7 +8,7 @@ css: scss/index.scss section1: title: KubeSphere Container Platform topic: The Kubernetes Platform, tailored for the hybrid cloud - content: KubeSphere is a distributed operating system providing cloud native stacks with Kubernetes as its kernel, and aims to create a plug-and-play architecture for third-party applications for seamless integration to boost its ecosystem. + content: KubeSphere is a distributed operating system managing cloud native applications with Kubernetes as its kernel, and provides plug-and-play architecture for the seamless integration of third-party applications to boost its ecosystem. btnContent1: Install on Kubernetes btnContent2: Install on Linux @@ -44,14 +44,14 @@ section3: children: - content: Improve your environment utilization and reduce internal infrastructure costs - content: Support multi-cluster and multi-cloud Kubernetes management, avoiding vendor lock-in - - content: Provide security enhancements, multiple storage and network solutions + - content: Provide security enhancements, and support multiple storage and network solutions - content: Deliver a trustworthy and certified Kubernetes platform and distribution - name: Developers content: Focus on your business as automation tools do the rest icon: /images/home/74.png children: - - content: Create a smooth user experience and reduce the learning curve of the cloud native stack + - content: Create smooth user experience and reduce the learning curve of the cloud native stack - content: Provide toolkits and deployment automation tailored to any application environment - content: Offer out-of-box logging, monitoring and multi-tenancy functions, improving development efficiency - content: Support application lifecycle management, accelerating time to market @@ -67,7 +67,7 @@ section3: section4: title: Key Features - content: If you are seeking for an open source project that also provides commercial products, KubeSphere is your choice.
The Roadmap lists planned features and you can raise a proposal to contribute your ideas to the community. + content: If you are seeking for an open source project run as a commerical product, KubeSphere is your choice.
The Roadmap lists planned features and you can raise a proposal to contribute your ideas to the community. children: - name: Provisioning Kubernetes icon: /images/home/provisioning-kubernetes.svg @@ -114,7 +114,7 @@ section4: - name: Multi-cluster management icon: /images/home/management.svg - content: Distribute applications across multiple clusters and cloud providers, and provide disaster recovery plans and cross-cluster discovery + content: Distribute applications across multiple clusters and cloud providers, and provide disaster recovery solutions and cross-cluster discovery color: orange section5: From 105388ecaeeafb66f625f49cd58e73cded461825 Mon Sep 17 00:00:00 2001 From: sherlockxu Date: Wed, 27 May 2020 17:17:36 +0800 Subject: [PATCH 6/7] Contribution EN Update --- content/en/contribution/_index.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/content/en/contribution/_index.md b/content/en/contribution/_index.md index 5389bc4e6..949cac127 100644 --- a/content/en/contribution/_index.md +++ b/content/en/contribution/_index.md @@ -44,7 +44,7 @@ section2: link: '' organization: - topic: 'Community Framework' + topic: 'Community Governance' name: 'KubeSphere Community' icon: 'images/contribution/28.svg' topIcon: 'images/contribution/8.svg' @@ -85,7 +85,7 @@ section3: - name: 'Apps' icon: '/images/contribution/apps.svg' iconActive: '/images/contribution/apps-active.svg' - content: 'App charts for the built-in App Store' + content: 'App charts for the built-in Application Store' link: '' linkContent: 'Join SIG - Apps →' children: @@ -93,12 +93,12 @@ section3: - icon: '/images/contribution/calicq2.jpg' - icon: '/images/contribution/calicq3.jpg' - - name: 'App Store' + - name: 'Application Store' icon: '/images/contribution/app-store.svg' iconActive: '/images/contribution/app-store-active.svg' content: '' link: '' - linkContent: 'Join SIG - App store →' + linkContent: 'Join SIG - Application store →' children: - icon: '' - icon: '' From c0692a25e68e64fec42d2c178b23404dd25c69ff Mon Sep 17 00:00:00 2001 From: sherlockxu Date: Wed, 27 May 2020 18:20:38 +0800 Subject: [PATCH 7/7] One tiny change to En homepage --- content/en/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/en/_index.md b/content/en/_index.md index bdb1c821c..d466e07e1 100644 --- a/content/en/_index.md +++ b/content/en/_index.md @@ -67,7 +67,7 @@ section3: section4: title: Key Features - content: If you are seeking for an open source project run as a commerical product, KubeSphere is your choice.
The Roadmap lists planned features and you can raise a proposal to contribute your ideas to the community. + content: If you are seeking for an open source project that rivals a commercial product, KubeSphere is your choice.
The Roadmap lists planned features and you can raise a proposal to contribute your ideas to the community. children: - name: Provisioning Kubernetes icon: /images/home/provisioning-kubernetes.svg