From 2038063cddd41445dde976ea3ee4a59b06f07211 Mon Sep 17 00:00:00 2001 From: Serena Fang Date: Wed, 1 Jul 2020 22:15:52 +0000 Subject: [PATCH 1/2] Multiple clusters moving to core --- doc/user/project/clusters/index.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/doc/user/project/clusters/index.md b/doc/user/project/clusters/index.md index 2c532ac24c8a77..5006f04bd7068e 100644 --- a/doc/user/project/clusters/index.md +++ b/doc/user/project/clusters/index.md @@ -64,11 +64,9 @@ to: (EKS) using GitLab's UI. - Add an integration to an existing cluster from any Kubernetes platform. -### Multiple Kubernetes clusters **(PREMIUM)** +### Multiple Kubernetes clusters -> Introduced in [GitLab Premium](https://about.gitlab.com/pricing/) 10.3. - -With GitLab Premium, you can associate more than one Kubernetes cluster to your +You can associate more than one Kubernetes cluster to your project. That way you can have different clusters for different environments, like dev, staging, production, and so on. -- GitLab From 482be11e88bf569c8008b4cc1b75eaf0395562e9 Mon Sep 17 00:00:00 2001 From: serenafang Date: Wed, 1 Jul 2020 17:53:25 -0500 Subject: [PATCH 2/2] Fix multiple clusters premium anchor --- doc/README.md | 4 ++-- doc/topics/autodevops/index.md | 4 ++-- doc/topics/autodevops/quick_start_guide.md | 2 +- .../projects/clusters/_multiple_clusters_message.html.haml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/README.md b/doc/README.md index 65044edff53eec..5b53068de095b5 100644 --- a/doc/README.md +++ b/doc/README.md @@ -314,11 +314,11 @@ The following documentation relates to the DevOps **Configure** stage: | [GitLab ChatOps](ci/chatops/README.md) | Interact with CI/CD jobs through chat services. | | [Installing Applications](user/project/clusters/index.md#installing-applications) | Deploy Helm, Ingress, and Prometheus on Kubernetes. | | [Mattermost slash commands](user/project/integrations/mattermost_slash_commands.md) | Enable and use slash commands from within Mattermost. | -| [Multiple Kubernetes Clusters](user/project/clusters/index.md#multiple-kubernetes-clusters-premium) **(PREMIUM)** | Associate more than one Kubernetes clusters to your project. | +| [Multiple Kubernetes Clusters](user/project/clusters/index.md#multiple-kubernetes-clusters) | Associate more than one Kubernetes clusters to your project. | | [Protected variables](ci/variables/README.md#protect-a-custom-variable) | Restrict variables to protected branches and tags. | | [Serverless](user/project/clusters/serverless/index.md) | Run serverless workloads on Kubernetes. | | [Slack slash commands](user/project/integrations/slack_slash_commands.md) | Enable and use slash commands from within Slack. | -| [Manage your infrastructure with Terraform](user/infrastructure/index.md) | Manage your infrastructure as you run your CI/CD pipeline. | +| [Manage your infrastructure with Terraform](user/infrastructure/index.md) | Manage your infrastructure as you run your CI/CD pipeline. |
diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md index e9b59b8c2223d2..5deedd1dcfab23 100644 --- a/doc/topics/autodevops/index.md +++ b/doc/topics/autodevops/index.md @@ -240,11 +240,11 @@ TIP: **Tip:** Use the [blue-green deployment](../../ci/environments/incremental_rollouts.md#blue-green-deployment) technique to minimize downtime and risk. -## Using multiple Kubernetes clusters **(PREMIUM)** +## Using multiple Kubernetes clusters When using Auto DevOps, you can deploy different environments to different Kubernetes clusters, due to the 1:1 connection -[existing between them](../../user/project/clusters/index.md#multiple-kubernetes-clusters-premium). +[existing between them](../../user/project/clusters/index.md#multiple-kubernetes-clusters). The [Deploy Job template](https://gitlab.com/gitlab-org/gitlab/blob/master/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml) used by Auto DevOps currently defines 3 environment names: diff --git a/doc/topics/autodevops/quick_start_guide.md b/doc/topics/autodevops/quick_start_guide.md index ec5191dd4ac438..39fe7c796eba0b 100644 --- a/doc/topics/autodevops/quick_start_guide.md +++ b/doc/topics/autodevops/quick_start_guide.md @@ -305,7 +305,7 @@ all within GitLab. Despite its automatic nature, Auto DevOps can also be configu and customized to fit your workflow. Here are some helpful resources for further reading: 1. [Auto DevOps](index.md) -1. [Multiple Kubernetes clusters](index.md#using-multiple-kubernetes-clusters-premium) **(PREMIUM)** +1. [Multiple Kubernetes clusters](index.md#using-multiple-kubernetes-clusters) 1. [Incremental rollout to production](customize.md#incremental-rollout-to-production-premium) **(PREMIUM)** 1. [Disable jobs you don't need with environment variables](customize.md#environment-variables) 1. [Use a static IP for your cluster](../../user/clusters/applications.md#using-a-static-ip) diff --git a/ee/app/views/projects/clusters/_multiple_clusters_message.html.haml b/ee/app/views/projects/clusters/_multiple_clusters_message.html.haml index 0e5703e3852ad4..da3e128ba32744 100644 --- a/ee/app/views/projects/clusters/_multiple_clusters_message.html.haml +++ b/ee/app/views/projects/clusters/_multiple_clusters_message.html.haml @@ -1,4 +1,4 @@ -- autodevops_help_url = help_page_path('topics/autodevops/index.md', anchor: 'using-multiple-kubernetes-clusters-premium') +- autodevops_help_url = help_page_path('topics/autodevops/index.md', anchor: 'using-multiple-kubernetes-clusters') - help_link_start = ''.html_safe - help_link_end = ''.html_safe -- GitLab