diff --git a/content/en/_index.md b/content/en/_index.md index b787a67e1..39aafd5d7 100644 --- a/content/en/_index.md +++ b/content/en/_index.md @@ -184,8 +184,8 @@ section6: btnContent: Case Studies btnLink: case/ - link: mailto:kubesphere@gmail.com - linkContent: Want to join our user community and showcase your logo? Just send an email to kubesphere@gmail.com + link: mailto:info@kubesphere.io + linkContent: Want to join our user community and showcase your logo? Just send an email to info@kubesphere.io joinTitle: Join the Revolution, Partner with KubeSphere Container Platform joinContent: We look forward to your joining KubeSphere partner program to improve both ecosystems and grow your business. joinLink: partner/ diff --git a/content/en/case/_index.md b/content/en/case/_index.md index 746fac9ba..7c5e10f00 100644 --- a/content/en/case/_index.md +++ b/content/en/case/_index.md @@ -111,5 +111,5 @@ section3: bottomContent: content: Want your logo up there? Just linkContent: email you company's logo to us → - link: mailto:kubesphere@gmail.com + link: mailto:info@kubesphere.io --- diff --git a/content/en/docs/_index.md b/content/en/docs/_index.md index 3c18bc529..249f0153c 100644 --- a/content/en/docs/_index.md +++ b/content/en/docs/_index.md @@ -48,12 +48,12 @@ section3: - image: /images/docs/aws.jpg content: AWS Quickstart link: https://aws.amazon.com/quickstart/architecture/qingcloud-kubesphere/ + - image: /images/docs/microsoft-azure.png + content: Azure Marketplace + link: https://market.azure.cn/marketplace/apps/qingcloud.kubesphere - image: /images/docs/qingcloud.svg content: QingCloud QKE link: https://www.qingcloud.com/products/kubesphereqke/ - - image: /images/docs/radore.jpg - content: Radore RCD - link: titleRight: Want to host KubeSphere on your cloud? btnContent: Partner with us diff --git a/content/en/privacy/_index.md b/content/en/privacy/_index.md index 32cbfb20f..35aefb475 100644 --- a/content/en/privacy/_index.md +++ b/content/en/privacy/_index.md @@ -465,7 +465,7 @@ For the purpose of the GDPR, Service Providers are considered Data Processors.Exercising Your CCPA Data Protection Rights

In order to exercise any of Your rights under the CCPA, and if You are a California resident, You can contact Us:

Only You, or a person registered with the California Secretary of State that You authorize to act on Your behalf, may make a verifiable request related to Your personal information.

Your request to Us must:

@@ -523,5 +523,5 @@ For the purpose of the GDPR, Service Providers are considered Data Processors.Contact Us

If you have any questions about this Privacy Policy, You can contact us:

\ No newline at end of file diff --git a/content/zh/_index.md b/content/zh/_index.md index 8233fd891..f9b30a352 100644 --- a/content/zh/_index.md +++ b/content/zh/_index.md @@ -183,8 +183,8 @@ section6: btnContent: 案例学习 btnLink: case/ - link: mailto:kubesphere@gmail.com - linkContent: 希望加入用户社区并在 KubeSphere 官网展示您的 Logo？请邮件至 kubesphere@gmail.com + link: mailto:info@kubesphere.io + linkContent: 希望加入用户社区并在 KubeSphere 官网展示您的 Logo？请邮件至 info@kubesphere.io joinTitle: 加入 KubeSphere 社区合作伙伴计划 joinContent: 我们非常期待您加入 KubeSphere 社区合作伙伴计划，共同完善各自的生态，加速您的业务增长。 joinLink: partner/ diff --git a/content/zh/case/_index.md b/content/zh/case/_index.md index f5b67d3dd..d9cc98137 100644 --- a/content/zh/case/_index.md +++ b/content/zh/case/_index.md @@ -111,5 +111,5 @@ section3: bottomContent: content: 希望在 KubeSphere 官网展示您的 Logo 或分享您的使用案例？ linkContent: 欢迎给我们发邮件 → - link: mailto:kubesphere@gmail.com + link: mailto:info@kubesphere.io --- diff --git a/content/zh/docs/_index.md b/content/zh/docs/_index.md index 49b17cd32..c1295f368 100644 --- a/content/zh/docs/_index.md +++ b/content/zh/docs/_index.md @@ -48,12 +48,12 @@ section3: - image: /images/docs/aws.jpg content: AWS Quickstart link: https://aws.amazon.com/quickstart/architecture/qingcloud-kubesphere/ + - image: /images/docs/microsoft-azure.png + content: Azure Marketplace + link: https://market.azure.cn/marketplace/apps/qingcloud.kubesphere - image: /images/docs/qingcloud.svg content: QingCloud QKE link: https://www.qingcloud.com/products/kubesphereqke/ - - image: /images/docs/radore.jpg - content: Radore RCD - link: titleRight: 想要在您的云上托管 KubeSphere? btnContent: 与我们合作 diff --git a/content/zh/privacy/_index.md b/content/zh/privacy/_index.md index 32cbfb20f..35aefb475 100644 --- a/content/zh/privacy/_index.md +++ b/content/zh/privacy/_index.md @@ -465,7 +465,7 @@ For the purpose of the GDPR, Service Providers are considered Data Processors.Exercising Your CCPA Data Protection Rights

In order to exercise any of Your rights under the CCPA, and if You are a California resident, You can contact Us:

Only You, or a person registered with the California Secretary of State that You authorize to act on Your behalf, may make a verifiable request related to Your personal information.

Your request to Us must:

@@ -523,5 +523,5 @@ For the purpose of the GDPR, Service Providers are considered Data Processors.Contact Us

If you have any questions about this Privacy Policy, You can contact us:

\ No newline at end of file diff --git a/data/en/footer.yaml b/data/en/footer.yaml index c0f14f5a2..d529420a0 100644 --- a/data/en/footer.yaml +++ b/data/en/footer.yaml @@ -2,18 +2,21 @@ footer: list: - title: Scenarios list: - - content: DevOps + - content: Kubernetes DevOps and GitOps link: devops/ - - content: Microservices + - content: Microservices with Service Mesh link: service-mesh/ - - content: Observability + - content: Cloud Native Observability link: observability/ - content: Bare Metal LoadBalancer link: 'https://porterlb.io/' + - content: Functions-as-a-Service Platform and Serverless + link: 'https://github.com/OpenFunction/OpenFunction' + - content: Multi-cloud Apps Mgmt link: 'https://github.com/openpitrix/openpitrix' @@ -56,11 +59,13 @@ footer: - title: Products and Services list: - - content: KubeSphere on QingCloud(QKE) - link: 'https://www.qingcloud.com/products/kubesphereqke' - content: KubeSphere on AWS link: 'https://aws.amazon.com/quickstart/architecture/qingcloud-kubesphere/' - - content: Cloud application service platform + - content: KubeSphere on Azure + link: 'https://market.azure.cn/marketplace/apps/qingcloud.kubesphere' + - content: KubeSphere on QingCloud(QKE) + link: 'https://www.qingcloud.com/products/kubesphereqke' + - content: Cloud Native Services and Support link: 'https://kubesphere.cloud' - - content: Cooperation and consulting - link: 'https://jinshuju.net/f/tPUldX' + - content: Contact Us + link: 'https://jinshuju.net/f/bDS8me' diff --git a/data/zh/footer.yaml b/data/zh/footer.yaml index d41da094e..edf2dbb4b 100644 --- a/data/zh/footer.yaml +++ b/data/zh/footer.yaml @@ -17,6 +17,9 @@ footer: - content: K8s 一键部署与运维 link: 'https://github.com/kubesphere/kubekey' + - content: 构建 FaaS 平台与 Serverless 架构 + link: 'https://github.com/OpenFunction/OpenFunction' + - content: 多云应用管理平台 link: 'https://openpitrix.io/' @@ -65,6 +68,8 @@ footer: list: - content: KubeSphere on AWS link: 'https://aws.amazon.com/cn/quickstart/architecture/qingcloud-kubesphere/' + - content: KubeSphere on Azure + link: 'https://market.azure.cn/marketplace/apps/qingcloud.kubesphere' - content: KubeSphere on QingCloud(QKE) link: 'https://www.qingcloud.com/products/kubesphereqke' - content: 云原生应用服务平台 diff --git a/i18n/en.yaml b/i18n/en.yaml index ef726a2df..6868a89c4 100644 --- a/i18n/en.yaml +++ b/i18n/en.yaml @@ -1,7 +1,7 @@ - id: Technology Blogs translation: Technology Blogs -- id: KubeSphere®️ 2020 All Rights Reserved. - translation: KubeSphere®️ 2020 All Rights Reserved. +- id: KubeSphere®️ 2021 All Rights Reserved. + translation: KubeSphere®️ 2021 All Rights Reserved. - id: Published on translation: Published on - id: KubeCon & QCon diff --git a/i18n/tr.yaml b/i18n/tr.yaml index 4ecf2a112..669d6b507 100644 --- a/i18n/tr.yaml +++ b/i18n/tr.yaml @@ -1,5 +1,5 @@ -- id: KubeSphere®️ 2020 All Rights Reserved. - translation: KubeSphere®️ 2020 Tüm Hakları Saklıdır. +- id: KubeSphere®️ 2021 All Rights Reserved. + translation: KubeSphere®️ 2021 Tüm Hakları Saklıdır. - id: Published on translation: Published on - id: KubeCon & QCon diff --git a/i18n/zh.yaml b/i18n/zh.yaml index 71119dd1b..273531b45 100644 --- a/i18n/zh.yaml +++ b/i18n/zh.yaml @@ -1,7 +1,7 @@ - id: Technology Blogs translation: 技术博客 -- id: KubeSphere®️ 2020 All Rights Reserved. - translation: "KubeSphere®️ 2020 All Rights Reserved." +- id: KubeSphere®️ 2021 All Rights Reserved. + translation: "KubeSphere®️ 2021 All Rights Reserved." - id: Published on translation: 发布于 - id: KubeCon & QCon diff --git a/layouts/docs/second.html b/layouts/docs/second.html index adc5f07ff..add15eaca 100644 --- a/layouts/docs/second.html +++ b/layouts/docs/second.html @@ -111,7 +111,7 @@ height="0" width="0" style="display:none;visibility:hidden">
  • email - email + email
    • @@ -325,7 +325,7 @@ height="0" width="0" style="display:none;visibility:hidden"> -

    {{ i18n "KubeSphere®️ 2020 All Rights Reserved." }}

    +

    {{ i18n "KubeSphere®️ 2021 All Rights Reserved." }}

    diff --git a/layouts/docs/single.html b/layouts/docs/single.html index 4d8fce74d..e7366c71d 100644 --- a/layouts/docs/single.html +++ b/layouts/docs/single.html @@ -111,7 +111,7 @@ height="0" width="0" style="display:none;visibility:hidden">
  • email - email + email
    • @@ -306,7 +306,7 @@ height="0" width="0" style="display:none;visibility:hidden"> -

    {{ i18n "KubeSphere®️ 2020 All Rights Reserved." }}

    +

    {{ i18n "KubeSphere®️ 2021 All Rights Reserved." }}

    diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 6309e1d36..1dbc9322d 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -67,7 +67,7 @@ -

    {{ i18n "KubeSphere®️ 2020 All Rights Reserved." }}

    +

    {{ i18n "KubeSphere®️ 2021 All Rights Reserved." }}

    {{ if .Site.Params.showCaseNumber }}

    - 🚀 KubeSphere 3.1.0 is now generally available as it extends Kubernetes from the cloud to the edge. Read the Release Notes for 3.1.0 → + 🚀 KubeSphere 3.1.0 is now generally available as it extends Kubernetes from the cloud to the edge. Read the GA Announcement for 3.1.0 → close
    diff --git a/static/images/docs/microsoft-azure.jpg b/static/images/docs/microsoft-azure.jpg new file mode 100644 index 000000000..1beddfdda Binary files /dev/null and b/static/images/docs/microsoft-azure.jpg differ diff --git a/static/json/crd-3.1.json b/static/json/crd-3.1.json index 5f05e65ee..8f2a750da 100644 --- a/static/json/crd-3.1.json +++ b/static/json/crd-3.1.json @@ -5,7 +5,7 @@ "contact": { "name": "KubeSphere", "url": "https://kubesphere.io/", - "email": "kubesphere@gmail.com" + "email": "info@kubesphere.io" }, "license": { "name": "Apache 2.0", diff --git a/static/json/crd.json b/static/json/crd.json index 3523f1cc1..f891eb7c5 100644 --- a/static/json/crd.json +++ b/static/json/crd.json @@ -5,7 +5,7 @@ "contact": { "name": "KubeSphere", "url": "https://kubesphere.io/", - "email": "kubesphere@gmail.com" + "email": "info@kubesphere.io" }, "license": { "name": "Apache 2.0", diff --git a/static/json/kubesphere-3.1.json b/static/json/kubesphere-3.1.json index 9d9ac2491..0b0a2356b 100644 --- a/static/json/kubesphere-3.1.json +++ b/static/json/kubesphere-3.1.json @@ -6,7 +6,7 @@ "contact": { "name": "KubeSphere", "url": "https://kubesphere.io/", - "email": "kubesphere@gmail.com" + "email": "info@kubesphere.io" }, "license": { "name": "Apache 2.0", diff --git a/static/json/kubesphere.json b/static/json/kubesphere.json index 9b6b05fa2..2ce6e508f 100644 --- a/static/json/kubesphere.json +++ b/static/json/kubesphere.json @@ -6,7 +6,7 @@ "contact": { "name": "kubesphere", "url": "https://kubesphere.io", - "email": "kubesphere@gmail.com" + "email": "info@kubesphere.io" }, "license": { "name": "Apache",