From 93b806c468a5a88950d28f82f99294ee0e8cef13 Mon Sep 17 00:00:00 2001
From: Mayra Cabrera <mcabrera@gitlab.com>
Date: Mon, 25 Mar 2019 15:18:39 +0000
Subject: [PATCH] Improvements for Knative installation

Displays Knative domain field automatically after Helm is successfully
installed.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56954
---
 app/helpers/clusters_helper.rb                |  6 ++++
 app/views/clusters/clusters/show.html.haml    |  2 +-
 ...mprove-knative-after-installing-tiller.yml |  5 +++
 spec/factories/clusters/providers/gcp.rb      |  4 +++
 spec/helpers/clusters_helper_spec.rb          | 33 +++++++++++++++++++
 5 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased/56954-improve-knative-after-installing-tiller.yml
 create mode 100644 spec/helpers/clusters_helper_spec.rb

diff --git a/app/helpers/clusters_helper.rb b/app/helpers/clusters_helper.rb
index 916dcb1a308..769f75f57c4 100644
--- a/app/helpers/clusters_helper.rb
+++ b/app/helpers/clusters_helper.rb
@@ -14,4 +14,10 @@ module ClustersHelper
       render 'clusters/clusters/gcp_signup_offer_banner'
     end
   end
+
+  def has_rbac_enabled?(cluster)
+    return cluster.platform_kubernetes_rbac? if cluster.platform_kubernetes
+
+    !cluster.provider.legacy_abac?
+  end
 end
diff --git a/app/views/clusters/clusters/show.html.haml b/app/views/clusters/clusters/show.html.haml
index 68d9510e1bf..61188c6fa0b 100644
--- a/app/views/clusters/clusters/show.html.haml
+++ b/app/views/clusters/clusters/show.html.haml
@@ -17,7 +17,7 @@
   install_knative_path: clusterable.install_applications_cluster_path(@cluster, :knative),
   update_knative_path: clusterable.update_applications_cluster_path(@cluster, :knative),
   toggle_status: @cluster.enabled? ? 'true': 'false',
-  has_rbac: @cluster.platform_kubernetes_rbac? ? 'true': 'false',
+  has_rbac: has_rbac_enabled?(@cluster) ? 'true': 'false',
   cluster_type: @cluster.cluster_type,
   cluster_status: @cluster.status_name,
   cluster_status_reason: @cluster.status_reason,
diff --git a/changelogs/unreleased/56954-improve-knative-after-installing-tiller.yml b/changelogs/unreleased/56954-improve-knative-after-installing-tiller.yml
new file mode 100644
index 00000000000..b9fb27c3218
--- /dev/null
+++ b/changelogs/unreleased/56954-improve-knative-after-installing-tiller.yml
@@ -0,0 +1,5 @@
+---
+title: Improve the Knative installation on Clusters
+merge_request: 26339
+author:
+type: added
diff --git a/spec/factories/clusters/providers/gcp.rb b/spec/factories/clusters/providers/gcp.rb
index a002ab28519..186c7c8027c 100644
--- a/spec/factories/clusters/providers/gcp.rb
+++ b/spec/factories/clusters/providers/gcp.rb
@@ -28,5 +28,9 @@ FactoryBot.define do
         gcp.make_errored('Something wrong')
       end
     end
+
+    trait :abac_enabled do
+      legacy_abac true
+    end
   end
 end
diff --git a/spec/helpers/clusters_helper_spec.rb b/spec/helpers/clusters_helper_spec.rb
new file mode 100644
index 00000000000..4ea0f76fc28
--- /dev/null
+++ b/spec/helpers/clusters_helper_spec.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe ClustersHelper do
+  describe '#has_rbac_enabled?' do
+    context 'when kubernetes platform has been created' do
+      let(:platform_kubernetes) { build_stubbed(:cluster_platform_kubernetes) }
+      let(:cluster) { build_stubbed(:cluster, :provided_by_gcp, platform_kubernetes: platform_kubernetes) }
+
+      it 'returns kubernetes platform value' do
+        expect(helper.has_rbac_enabled?(cluster)).to be_truthy
+      end
+    end
+
+    context 'when kubernetes platform has not been created yet' do
+      let(:cluster) { build_stubbed(:cluster, :providing_by_gcp) }
+
+      it 'delegates to cluster provider' do
+        expect(helper.has_rbac_enabled?(cluster)).to be_truthy
+      end
+
+      context 'when ABAC cluster is created' do
+        let(:provider) { build_stubbed(:cluster_provider_gcp, :abac_enabled) }
+        let(:cluster) { build_stubbed(:cluster, :providing_by_gcp, provider_gcp: provider) }
+
+        it 'delegates to cluster provider' do
+          expect(helper.has_rbac_enabled?(cluster)).to be_falsy
+        end
+      end
+    end
+  end
+end