diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-17 15:09:10 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-17 15:09:10 +0000 |
| commit | 8e129497b2565b8c595ef4f806d9a9595ca654e5 (patch) | |
| tree | 7afeeca3ea58013c1e8c3a2055661bacf65577da /app/assets/javascripts/clusters | |
| parent | 8ae26d705abe341b03bc15d4373d6cd0c77c0baf (diff) | |
| download | gitlab-ce-8e129497b2565b8c595ef4f806d9a9595ca654e5.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/clusters')
| -rw-r--r-- | app/assets/javascripts/clusters/components/applications.vue | 5 | ||||
| -rw-r--r-- | app/assets/javascripts/clusters/stores/clusters_store.js | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue index 442c52110f2..87d190e51c4 100644 --- a/app/assets/javascripts/clusters/components/applications.vue +++ b/app/assets/javascripts/clusters/components/applications.vue @@ -634,8 +634,13 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity :status-reason="applications.elastic_stack.statusReason" :request-status="applications.elastic_stack.requestStatus" :request-reason="applications.elastic_stack.requestReason" + :version="applications.elastic_stack.version" + :chart-repo="applications.elastic_stack.chartRepo" + :update-available="applications.elastic_stack.updateAvailable" :installed="applications.elastic_stack.installed" :install-failed="applications.elastic_stack.installFailed" + :update-successful="applications.elastic_stack.updateSuccessful" + :update-failed="applications.elastic_stack.updateFailed" :uninstallable="applications.elastic_stack.uninstallable" :uninstall-successful="applications.elastic_stack.uninstallSuccessful" :uninstall-failed="applications.elastic_stack.uninstallFailed" diff --git a/app/assets/javascripts/clusters/stores/clusters_store.js b/app/assets/javascripts/clusters/stores/clusters_store.js index 1d17170cea1..00ed939e3b4 100644 --- a/app/assets/javascripts/clusters/stores/clusters_store.js +++ b/app/assets/javascripts/clusters/stores/clusters_store.js @@ -12,6 +12,7 @@ import { INSTALL_EVENT, UPDATE_EVENT, UNINSTALL_EVENT, + ELASTIC_STACK, } from '../constants'; import transitionApplicationState from '../services/application_state_machine'; @@ -237,6 +238,9 @@ export default class ClusterStore { } else if (appId === RUNNER) { this.state.applications.runner.version = version; this.state.applications.runner.updateAvailable = updateAvailable; + } else if (appId === ELASTIC_STACK) { + this.state.applications.elastic_stack.version = version; + this.state.applications.elastic_stack.updateAvailable = updateAvailable; } }); } |