diff options
| author | Matt Kasa <mkasa@gitlab.com> | 2019-08-08 19:09:14 -0700 |
|---|---|---|
| committer | Matt Kasa <mkasa@gitlab.com> | 2019-08-08 19:09:14 -0700 |
| commit | 09af41d0667cf6050794a81f23b09e6a68791d6f (patch) | |
| tree | a5891c7a722cc42cb86fbc7f4789f984d96693d0 | |
| parent | 488a16d2ffc8aa344c5b191ab0463c1d1c217667 (diff) | |
| download | gitlab-ce-59370-cloud-run-on-gke-clusters.tar.gz | |
Add checkbox to enable Cloud Run on GKE to Gcp Clusters form partial and add a note to documentation describing the feature59370-cloud-run-on-gke-clusters
| -rw-r--r-- | app/views/clusters/clusters/gcp/_form.html.haml | 7 | ||||
| -rw-r--r-- | doc/user/project/clusters/index.md | 8 |
2 files changed, 15 insertions, 0 deletions
diff --git a/app/views/clusters/clusters/gcp/_form.html.haml b/app/views/clusters/clusters/gcp/_form.html.haml index 4d3e3359ea0..e3ce80ff59d 100644 --- a/app/views/clusters/clusters/gcp/_form.html.haml +++ b/app/views/clusters/clusters/gcp/_form.html.haml @@ -66,6 +66,13 @@ = s_('ClusterIntegration|Learn more about %{help_link_start_machine_type}machine types%{help_link_end} and %{help_link_start_pricing}pricing%{help_link_end}.').html_safe % { help_link_start_machine_type: help_link_start % { url: machine_type_link_url }, help_link_start_pricing: help_link_start % { url: pricing_link_url }, help_link_end: help_link_end } .form-group + = field.check_box :cloud_run, { label: s_('ClusterIntegration|Enable Cloud Run on GKE (beta)'), + label_class: 'label-bold' } + .form-text.text-muted + = s_('ClusterIntegration|Uses the Cloud Run, Istio, and HTTP Load Balancing addons for this cluster.') + = link_to _('More information'), help_page_path('user/project/clusters/index.md', anchor: 'cloud-run-on-gke'), target: '_blank' + + .form-group = field.check_box :managed, { label: s_('ClusterIntegration|GitLab-managed cluster'), label_class: 'label-bold' } .form-text.text-muted diff --git a/doc/user/project/clusters/index.md b/doc/user/project/clusters/index.md index ffaa07cb3a4..636840e732a 100644 --- a/doc/user/project/clusters/index.md +++ b/doc/user/project/clusters/index.md @@ -154,6 +154,7 @@ new Kubernetes cluster to your project: - **Number of nodes** - Enter the number of nodes you wish the cluster to have. - **Machine type** - The [machine type](https://cloud.google.com/compute/docs/machine-types) of the Virtual Machine instance that the cluster will be based on. + - **Enable Cloud Run on GKE (beta)** - Check this if you want to use Cloud Run on GKE for this cluster. See the [Cloud Run on GKE section](#cloud-run-on-gke) for more information. - **GitLab-managed cluster** - Leave this checked if you want GitLab to manage namespaces and service accounts for this cluster. See the [Managed clusters section](#gitlab-managed-clusters) for more information. 1. Finally, click the **Create Kubernetes cluster** button. @@ -336,6 +337,13 @@ functionalities needed to successfully build and deploy a containerized application. Bear in mind that the same credentials are used for all the applications running on the cluster. +### Cloud Run on GKE + +You can choose to use Cloud Run on GKE in place of installing Knative and Istio +separately after the cluster has been created. This implies that Cloud Run +(Knative), Istio, and HTTP Load Balancing should be enabled on the cluster at +create time. + ### GitLab-managed clusters > [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22011) in GitLab 11.5. |