diff options
author | Chris Baumbauer <cab@cabnetworks.net> | 2018-11-06 21:33:16 -0800 |
---|---|---|
committer | Chris Baumbauer <cab@cabnetworks.net> | 2018-11-06 21:33:16 -0800 |
commit | c2097ed74cc832972142d24f3cda1faf7a96d550 (patch) | |
tree | 406157adf00ea07c90ee322b86d1bda4b08c3d7b /app | |
parent | 26673cc82775255d3e7b3d489e930bc43f19e01b (diff) | |
download | gitlab-ce-c2097ed74cc832972142d24f3cda1faf7a96d550.tar.gz |
Fix style with clusters_store.js and remove workaround for namespace role issuetriggermesh/dgriffith/gitlab-ce-triggermesh-phase1-knative
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/clusters/stores/clusters_store.js | 4 | ||||
-rw-r--r-- | app/models/clusters/applications/knative.rb | 49 |
2 files changed, 4 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 |