Fix style with clusters_store.js and remove workaround for namespace role issuetriggermesh/dgriffith/gitlab-ce-triggermesh-phase1-knative

3 files changed, 8 insertions, 49 deletions

diff --git a/app/assets/javascripts/clusters/stores/clusters_store.js b/app/assets/javascripts/clusters/stores/clusters_store.js
index 5ec276f7788..e45da967392 100644
--- a/app/assets/javascripts/clusters/stores/clusters_store.js
+++ b/app/assets/javascripts/clusters/stores/clusters_store.js
@@ -102,8 +102,8 @@ export default class ClusterStore {
             ? `jupyter.${this.state.applications.ingress.externalIp}.nip.io`
             : '');
       } else if (appId === KNATIVE) {
-        this.state.applications.knative.hostname = serverAppEntry.hostname ||
-          this.state.applications.knative.hostname;
+        this.state.applications.knative.hostname =
+          serverAppEntry.hostname || this.state.applications.knative.hostname;
       }
     });
   }
diff --git a/app/models/clusters/applications/knative.rb b/app/models/clusters/applications/knative.rb
index 6c7d11901e3..8adb99fcb04 100644
--- a/app/models/clusters/applications/knative.rb
+++ b/app/models/clusters/applications/knative.rb
@@ -19,7 +19,7 @@ module Clusters
 
       default_value_for :version, VERSION
 
-      validates :hostname, presence: true
+      validates :hostname, presence: true, hostname: true
 
       def chart
         'knative/knative'
@@ -37,8 +37,7 @@ module Clusters
           chart: chart,
           files: files,
           repository: REPOSITORY,
-          preinstall: install_script,
-          postinstall: setup_knative_role
+          preinstall: install_script
         )
       end
 
@@ -47,50 +46,6 @@ module Clusters
       def install_script
         ["/usr/bin/kubectl apply -f #{ISTIO_CRDS} >/dev/null"]
       end
-
-      def setup_knative_role
-        if !cluster.kubernetes_namespace.nil?
-          [
-            "echo \'#{create_rolebinding.to_yaml}\' > /tmp/rolebinding.yaml\n",
-            "/usr/bin/kubectl apply -f /tmp/rolebinding.yaml > /dev/null"
-          ]
-        else
-          nil
-        end
-      end
-
-      def create_rolebinding
-        {
-          "apiVersion" => "rbac.authorization.k8s.io/v1",
-          "kind" => "ClusterRoleBinding",
-          "metadata" => {
-            "name" => create_role_binding_name,
-            "namespace" => namespace
-          },
-          "roleRef" => {
-            "apiGroup" => "rbac.authorization.k8s.io",
-            "kind" => "ClusterRole",
-            "name" => "knative-serving-admin"
-          },
-          "subjects" => role_subject
-        }
-      end
-
-      def create_role_binding_name
-        "#{namespace}-knative-binding"
-      end
-
-      def service_account_name
-        cluster.kubernetes_namespace.service_account_name
-      end
-
-      def role_subject
-        [{ "kind" => 'ServiceAccount', "name" => service_account_name, "namespace" => namespace }]
-      end
-
-      def namespace
-        cluster.kubernetes_namespace.namespace
-      end
     end
   end
 end
diff --git a/spec/models/clusters/applications/knative_spec.rb b/spec/models/clusters/applications/knative_spec.rb
index dff9684ab2a..be2a91d566b 100644
--- a/spec/models/clusters/applications/knative_spec.rb
+++ b/spec/models/clusters/applications/knative_spec.rb
@@ -70,4 +70,8 @@ describe Clusters::Applications::Knative do
       expect(values).to include('domain')
     end
   end
+
+  describe 'validations' do
+    it { is_expected.to validate_presence_of(:hostname) }
+  end
 end