Adds a checkbox to cluster create to enable Cloud Run on GKE59370-cloud-run-on-gke

8 files changed, 122 insertions, 66 deletions

diff --git a/app/controllers/clusters/clusters_controller.rb b/app/controllers/clusters/clusters_controller.rb
index ec8077d18e3..9e5837d2539 100644
--- a/app/controllers/clusters/clusters_controller.rb
+++ b/app/controllers/clusters/clusters_controller.rb
@@ -156,6 +156,7 @@ class Clusters::ClustersController < Clusters::BaseController
       :name,
       :environment_scope,
       :managed,
+      :cloud_run,
       provider_gcp_attributes: [
         :gcp_project_id,
         :zone,
diff --git a/app/services/clusters/gcp/provision_service.rb b/app/services/clusters/gcp/provision_service.rb
index 80040511ec2..ebd8f84843a 100644
--- a/app/services/clusters/gcp/provision_service.rb
+++ b/app/services/clusters/gcp/provision_service.rb
@@ -22,13 +22,20 @@ module Clusters
       private
 
       def get_operation_id
+        enable_addons = []
+
+        if provider.cluster.cloud_run
+          enable_addons.concat([:http_load_balancing, :istio_config, :cloud_run_config])
+        end
+
         operation = provider.api_client.projects_zones_clusters_create(
           provider.gcp_project_id,
           provider.zone,
           provider.cluster.name,
           provider.num_nodes,
           machine_type: provider.machine_type,
-          legacy_abac: provider.legacy_abac
+          legacy_abac: provider.legacy_abac,
+          enable_addons: enable_addons
         )
 
         unless operation.status == 'PENDING' || operation.status == 'RUNNING'
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/config/initializers/google_api_client.rb b/config/initializers/google_api_client.rb
new file mode 100644
index 00000000000..3e393b65dbb
--- /dev/null
+++ b/config/initializers/google_api_client.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+#
+# google-api-client >= 0.26.0 supports enabling CloudRun and Istio during
+# cluster creation, but fog-google currently hard deps on '~> 0.23.0', which
+# prevents us from upgrading. We are injecting these options as hashes below
+# as a workaround until this is resolved.
+#
+# This can be removed once fog-google and google-api-client can be upgraded.
+#
+
+require 'google/apis/container_v1beta1'
+
+Google::Apis::ContainerV1beta1::AddonsConfig::Representation.tap do |representation|
+  representation.hash :cloud_run_config, as: 'cloudRunConfig'
+  representation.hash :istio_config, as: 'istioConfig'
+end
diff --git a/doc/user/project/clusters/index.md b/doc/user/project/clusters/index.md
index ffaa07cb3a4..8c8ad114d65 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,15 @@ 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
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/31790) in GitLab 12.2.
+
+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.
diff --git a/lib/google_api/cloud_platform/client.rb b/lib/google_api/cloud_platform/client.rb
index b5f99ea012b..006f54bfeb0 100644
--- a/lib/google_api/cloud_platform/client.rb
+++ b/lib/google_api/cloud_platform/client.rb
@@ -2,6 +2,7 @@
 
 require 'google/apis/compute_v1'
 require 'google/apis/container_v1'
+require 'google/apis/container_v1beta1'
 require 'google/apis/cloudbilling_v1'
 require 'google/apis/cloudresourcemanager_v1'
 
@@ -53,30 +54,40 @@ module GoogleApi
         service.get_zone_cluster(project_id, zone, cluster_id, options: user_agent_header)
       end
 
-      def projects_zones_clusters_create(project_id, zone, cluster_name, cluster_size, machine_type:, legacy_abac:)
-        service = Google::Apis::ContainerV1::ContainerService.new
+      def projects_zones_clusters_create(project_id, zone, cluster_name, cluster_size, machine_type:, legacy_abac:, enable_addons: [])
+        service = Google::Apis::ContainerV1beta1::ContainerService.new
         service.authorization = access_token
 
-        request_body = Google::Apis::ContainerV1::CreateClusterRequest.new(
-          {
-            "cluster": {
-              "name": cluster_name,
-              "initial_node_count": cluster_size,
-              "node_config": {
-                "machine_type": machine_type
-              },
-              "master_auth": {
-                "username": CLUSTER_MASTER_AUTH_USERNAME,
-                "client_certificate_config": {
-                  issue_client_certificate: true
-                }
-              },
-              "legacy_abac": {
-                "enabled": legacy_abac
+        cluster_options = {
+          cluster: {
+            name: cluster_name,
+            initial_node_count: cluster_size,
+            node_config: {
+              machine_type: machine_type
+            },
+            master_auth: {
+              username: CLUSTER_MASTER_AUTH_USERNAME,
+              client_certificate_config: {
+                issue_client_certificate: true
               }
+            },
+            legacy_abac: {
+              enabled: legacy_abac
             }
           }
-        )
+        }
+
+        enable_addons.each do |addon|
+          cluster_options[:cluster].tap do |cluster|
+            (cluster[:addons_config] ||= {}).tap do |addons_config|
+              (addons_config[addon] ||= {}).tap do |addon_config|
+                addon_config[:disabled] = false
+              end
+            end
+          end
+        end
+
+        request_body = Google::Apis::ContainerV1beta1::CreateClusterRequest.new(cluster_options)
 
         service.create_cluster(project_id, zone, request_body, options: user_agent_header)
       end
diff --git a/spec/lib/google_api/cloud_platform/client_spec.rb b/spec/lib/google_api/cloud_platform/client_spec.rb
index 1fefc947636..5d1514fd44d 100644
--- a/spec/lib/google_api/cloud_platform/client_spec.rb
+++ b/spec/lib/google_api/cloud_platform/client_spec.rb
@@ -66,7 +66,7 @@ describe GoogleApi::CloudPlatform::Client do
   describe '#projects_zones_clusters_create' do
     subject do
       client.projects_zones_clusters_create(
-        project_id, zone, cluster_name, cluster_size, machine_type: machine_type, legacy_abac: legacy_abac)
+        project_id, zone, cluster_name, cluster_size, machine_type: machine_type, legacy_abac: legacy_abac, enable_addons: enable_addons)
     end
 
     let(:project_id) { 'project-123' }
@@ -75,39 +75,47 @@ describe GoogleApi::CloudPlatform::Client do
     let(:cluster_size) { 1 }
     let(:machine_type) { 'n1-standard-2' }
     let(:legacy_abac) { true }
-    let(:create_cluster_request_body) { double('Google::Apis::ContainerV1::CreateClusterRequest') }
+    let(:enable_addons) { [] }
+    let(:addons_config) {
+      enable_addons.each_with_object({}) do |addon, hash|
+        hash[addon] = { disabled: false }
+      end
+    }
+    let(:cluster_options) {
+      {
+        cluster: {
+          name: cluster_name,
+          initial_node_count: cluster_size,
+          node_config: {
+            machine_type: machine_type
+          },
+          master_auth: {
+            username: 'admin',
+            client_certificate_config: {
+              issue_client_certificate: true
+            }
+          },
+          legacy_abac: {
+            enabled: legacy_abac
+          }
+        }.tap { |cluster| cluster[:addons_config] = addons_config unless enable_addons.empty? }
+      }
+    }
+    let(:create_cluster_request_body) { double('Google::Apis::ContainerV1beta1::CreateClusterRequest') }
     let(:operation) { double }
 
     before do
-      allow_any_instance_of(Google::Apis::ContainerV1::ContainerService)
+      allow_any_instance_of(Google::Apis::ContainerV1beta1::ContainerService)
         .to receive(:create_cluster).with(any_args)
         .and_return(operation)
     end
 
     it 'sets corresponded parameters' do
-      expect_any_instance_of(Google::Apis::ContainerV1::ContainerService)
+      expect_any_instance_of(Google::Apis::ContainerV1beta1::ContainerService)
         .to receive(:create_cluster).with(project_id, zone, create_cluster_request_body, options: user_agent_options)
 
-      expect(Google::Apis::ContainerV1::CreateClusterRequest)
-        .to receive(:new).with(
-          {
-            "cluster": {
-              "name": cluster_name,
-              "initial_node_count": cluster_size,
-              "node_config": {
-                "machine_type": machine_type
-              },
-              "master_auth": {
-                "username": "admin",
-                "client_certificate_config": {
-                  issue_client_certificate: true
-                }
-              },
-              "legacy_abac": {
-                "enabled": true
-              }
-            }
-          } ).and_return(create_cluster_request_body)
+      expect(Google::Apis::ContainerV1beta1::CreateClusterRequest)
+        .to receive(:new).with(cluster_options).and_return(create_cluster_request_body)
 
       expect(subject).to eq operation
     end
@@ -116,29 +124,25 @@ describe GoogleApi::CloudPlatform::Client do
       let(:legacy_abac) { false }
 
       it 'sets corresponded parameters' do
-        expect_any_instance_of(Google::Apis::ContainerV1::ContainerService)
+        expect_any_instance_of(Google::Apis::ContainerV1beta1::ContainerService)
+          .to receive(:create_cluster).with(project_id, zone, create_cluster_request_body, options: user_agent_options)
+
+        expect(Google::Apis::ContainerV1beta1::CreateClusterRequest)
+          .to receive(:new).with(cluster_options).and_return(create_cluster_request_body)
+
+        expect(subject).to eq operation
+      end
+    end
+
+    context 'create with enable_addons for cloud_run' do
+      let(:enable_addons) { [:http_load_balancing, :istio_config, :cloud_run_config] }
+
+      it 'sets corresponded parameters' do
+        expect_any_instance_of(Google::Apis::ContainerV1beta1::ContainerService)
           .to receive(:create_cluster).with(project_id, zone, create_cluster_request_body, options: user_agent_options)
 
-        expect(Google::Apis::ContainerV1::CreateClusterRequest)
-          .to receive(:new).with(
-            {
-              "cluster": {
-                "name": cluster_name,
-                "initial_node_count": cluster_size,
-                "node_config": {
-                  "machine_type": machine_type
-                },
-                "master_auth": {
-                  "username": "admin",
-                  "client_certificate_config": {
-                    issue_client_certificate: true
-                  }
-                },
-                "legacy_abac": {
-                  "enabled": false
-                }
-              }
-            } ).and_return(create_cluster_request_body)
+        expect(Google::Apis::ContainerV1beta1::CreateClusterRequest)
+          .to receive(:new).with(cluster_options).and_return(create_cluster_request_body)
 
         expect(subject).to eq operation
       end
diff --git a/spec/support/google_api/cloud_platform_helpers.rb b/spec/support/google_api/cloud_platform_helpers.rb
index a1328ef0d13..38ffca8c5ae 100644
--- a/spec/support/google_api/cloud_platform_helpers.rb
+++ b/spec/support/google_api/cloud_platform_helpers.rb
@@ -65,7 +65,7 @@ module GoogleApi
     end
 
     def cloud_platform_create_cluster_url(project_id, zone)
-      "https://container.googleapis.com/v1/projects/#{project_id}/zones/#{zone}/clusters"
+      "https://container.googleapis.com/v1beta1/projects/#{project_id}/zones/#{zone}/clusters"
     end
 
     def cloud_platform_get_zone_operation_url(project_id, zone, operation_id)