summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/clusters/components
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-14 00:08:14 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-14 00:08:14 +0000
commit427c549b6396885fb60a687326b6cd62878e4ca3 (patch)
tree145713e2f6fdaf7499b0cb44010503e16b6248b9 /app/assets/javascripts/clusters/components
parent74a89b1221eaf780374bd1d4c5b2ee4a0f488908 (diff)
downloadgitlab-ce-427c549b6396885fb60a687326b6cd62878e4ca3.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/clusters/components')
-rw-r--r--app/assets/javascripts/clusters/components/applications.vue40
1 files changed, 0 insertions, 40 deletions
diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue
index af50ca7361d..b37e644b503 100644
--- a/app/assets/javascripts/clusters/components/applications.vue
+++ b/app/assets/javascripts/clusters/components/applications.vue
@@ -222,9 +222,6 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity
elasticStackInstalled() {
return this.applications.elastic_stack.status === APPLICATION_STATUS.INSTALLED;
},
- elasticStackKibanaHostname() {
- return this.applications.elastic_stack.kibana_hostname;
- },
knative() {
return this.applications.knative;
},
@@ -681,9 +678,6 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity
:uninstall-successful="applications.elastic_stack.uninstallSuccessful"
:uninstall-failed="applications.elastic_stack.uninstallFailed"
:disabled="!helmInstalled"
- :install-application-request-params="{
- kibana_hostname: applications.elastic_stack.kibana_hostname,
- }"
title-link="https://github.com/helm/charts/tree/master/stable/elastic-stack"
>
<div slot="description">
@@ -694,40 +688,6 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity
)
}}
</p>
-
- <template v-if="ingressExternalEndpoint">
- <div class="form-group">
- <label for="elastic-stack-kibana-hostname">{{
- s__('ClusterIntegration|Kibana Hostname')
- }}</label>
-
- <div class="input-group">
- <input
- v-model="applications.elastic_stack.kibana_hostname"
- :readonly="elasticStackInstalled"
- type="text"
- class="form-control js-hostname"
- />
- <span class="input-group-btn">
- <clipboard-button
- :text="elasticStackKibanaHostname"
- :title="s__('ClusterIntegration|Copy Kibana Hostname')"
- class="js-clipboard-btn"
- />
- </span>
- </div>
-
- <p v-if="ingressInstalled" class="form-text text-muted">
- {{
- s__(`ClusterIntegration|Replace this with your own hostname if you want.
- If you do so, point hostname to Ingress IP Address from above.`)
- }}
- <a :href="ingressDnsHelpPath" target="_blank" rel="noopener noreferrer">
- {{ __('More information') }}
- </a>
- </p>
- </div>
- </template>
</div>
</application-row>
</div>