diff options
author | Mayra Cabrera <mcabrera@gitlab.com> | 2018-03-01 12:23:22 -0600 |
---|---|---|
committer | Mayra Cabrera <mcabrera@gitlab.com> | 2018-03-01 12:33:00 -0600 |
commit | 8e1b1e3a76490c3646e35a3549f676fd9af0485e (patch) | |
tree | 2ce5e111fb93c09ea0b0a53afc48294821488262 | |
parent | 3dd03d43aba9e987cdf0ad27524e15e26d11dd00 (diff) | |
download | gitlab-ce-32831-single-deploy-of-runner-in-k8s-cluster.tar.gz |
Readjust code with new changes:32831-single-deploy-of-runner-in-k8s-cluster
- Readapt clusters/components/applications.vue to also include Runner
row
- Adjust Ingress to new architecture for the install command
-rw-r--r-- | app/assets/javascripts/clusters/components/applications.vue | 21 | ||||
-rw-r--r-- | app/models/clusters/concerns/application_core.rb | 20 | ||||
-rw-r--r-- | spec/models/clusters/applications/ingress_spec.rb | 4 |
3 files changed, 18 insertions, 27 deletions
diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue index 35618398468..932635472c1 100644 --- a/app/assets/javascripts/clusters/components/applications.vue +++ b/app/assets/javascripts/clusters/components/applications.vue @@ -99,10 +99,10 @@ </p> `; }, - gitlabRunnerDescription() { + runnerDescription() { return _.escape(s__( - `ClusterIntegration|GitLab Runner is the open source project that is used to run your jobs - and send the results back to GitLab.`, + `ClusterIntegration|GitLab Runner connects to this project's repository and executes CI/CD jobs, + pushing results back and deploying applications to production.`, )); }, prometheusDescription() { @@ -256,6 +256,21 @@ > </div> </application-row> + <application-row + id="runner" + :title="applications.runner.title" + title-link="https://docs.gitlab.com/runner/" + :status="applications.runner.status" + :status-reason="applications.runner.statusReason" + :request-status="applications.runner.requestStatus" + :request-reason="applications.runner.requestReason" + > + <div + slot="description" + v-html="runnerDescription" + > + </div> + </application-row> <!-- NOTE: Don't forget to update `clusters.scss` min-height for this block and uncomment `application_spec` tests diff --git a/app/models/clusters/concerns/application_core.rb b/app/models/clusters/concerns/application_core.rb index b994586b334..623b836c0ed 100644 --- a/app/models/clusters/concerns/application_core.rb +++ b/app/models/clusters/concerns/application_core.rb @@ -28,26 +28,6 @@ module Clusters # Override if you need extra data synchronized # from K8s after installation end - - def repository - nil - end - - def chart - nil - end - - def chart_values_file - "#{Rails.root}/vendor/#{name}/values.yaml" - end - - def command(namespace_name) - "helm install #{chart} --name #{name} --namespace #{namespace_name} -f /data/helm/#{name}/config/values.yaml >/dev/null" - end - - def init_command - "helm init --client-only >/dev/null" - end end end end diff --git a/spec/models/clusters/applications/ingress_spec.rb b/spec/models/clusters/applications/ingress_spec.rb index 1dffb0ef8e0..03f5b88a525 100644 --- a/spec/models/clusters/applications/ingress_spec.rb +++ b/spec/models/clusters/applications/ingress_spec.rb @@ -11,8 +11,6 @@ describe Clusters::Applications::Ingress do allow(ClusterWaitForIngressIpAddressWorker).to receive(:perform_async) end - include_examples 'cluster application specs', described_class - describe '#make_installed!' do before do application.make_installed! @@ -56,8 +54,6 @@ describe Clusters::Applications::Ingress do end describe '#install_command' do - let(:kubeclient) { double('kubernetes client') } - subject { ingress.install_command } it { is_expected.to be_an_instance_of(Gitlab::Kubernetes::Helm::InstallCommand) } |