summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2017-11-06 10:50:10 +0100
committerKamil Trzcinski <ayufan@ayufan.eu>2017-11-06 10:50:10 +0100
commitfe0292cfa7266ad5f936e103cdf005a00da4c233 (patch)
treee9c8cd0fac5422d13a1e594e515db4a17e4f2d6b
parent4274418733c75198c38df5745c2827c6009bbc65 (diff)
downloadgitlab-ce-fe0292cfa7266ad5f936e103cdf005a00da4c233.tar.gz
Remove not used ingress and runner
-rw-r--r--app/assets/javascripts/clusters/clusters_bundle.js4
-rw-r--r--app/assets/javascripts/clusters/services/clusters_service.js2
-rw-r--r--app/views/projects/clusters/show.html.haml4
3 files changed, 1 insertions, 9 deletions
diff --git a/app/assets/javascripts/clusters/clusters_bundle.js b/app/assets/javascripts/clusters/clusters_bundle.js
index 053f11cc3c4..9a436b3e22d 100644
--- a/app/assets/javascripts/clusters/clusters_bundle.js
+++ b/app/assets/javascripts/clusters/clusters_bundle.js
@@ -28,8 +28,6 @@ export default class Clusters {
const {
statusPath,
installHelmPath,
- installIngressPath,
- installRunnerPath,
clusterStatus,
clusterStatusReason,
helpPath,
@@ -42,8 +40,6 @@ export default class Clusters {
this.service = new ClustersService({
endpoint: statusPath,
installHelmEndpoint: installHelmPath,
- installIngresEndpoint: installIngressPath,
- installRunnerEndpoint: installRunnerPath,
});
this.toggle = this.toggle.bind(this);
diff --git a/app/assets/javascripts/clusters/services/clusters_service.js b/app/assets/javascripts/clusters/services/clusters_service.js
index 0ac8e68187d..a7bb0961c7e 100644
--- a/app/assets/javascripts/clusters/services/clusters_service.js
+++ b/app/assets/javascripts/clusters/services/clusters_service.js
@@ -8,8 +8,6 @@ export default class ClusterService {
this.options = options;
this.appInstallEndpointMap = {
helm: this.options.installHelmEndpoint,
- ingress: this.options.installIngressEndpoint,
- runner: this.options.installRunnerEndpoint,
};
}
diff --git a/app/views/projects/clusters/show.html.haml b/app/views/projects/clusters/show.html.haml
index 799b07046e5..f116c4f7dba 100644
--- a/app/views/projects/clusters/show.html.haml
+++ b/app/views/projects/clusters/show.html.haml
@@ -6,9 +6,7 @@
- status_path = status_namespace_project_cluster_path(@cluster.project.namespace, @cluster.project, @cluster.id, format: :json) if can?(current_user, :admin_cluster, @cluster)
.edit-cluster-form.js-edit-cluster-form{ data: { status_path: status_path,
- install_helm_path: 'TODO',
- install_ingress_path: 'TODO',
- install_runner_path: 'TODO',
+ install_helm_path: install_applications_namespace_project_cluster_path(@cluster.project.namespace, @cluster.project, @cluster, :helm),
toggle_status: @cluster.enabled? ? 'true': 'false',
cluster_status: @cluster.status_name,
cluster_status_reason: @cluster.status_reason,