diff options
| author | Mayra Cabrera <mcabrera@gitlab.com> | 2018-03-05 14:27:37 -0600 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2018-03-05 14:30:29 -0600 |
| commit | 3a008a381df9074656469cc72cf05be828d0041b (patch) | |
| tree | 9d290ccb7b499c7b632532d223666ed3258fec2d | |
| parent | f5a1a535a1be9c80b03514499bad8f048a526e43 (diff) | |
| download | gitlab-ce-43793-enable-privileged-mode-for-runner.tar.gz | |
Dry up merge implementation on cluster runner app43793-enable-privileged-mode-for-runner
| -rw-r--r-- | app/models/clusters/applications/runner.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/app/models/clusters/applications/runner.rb b/app/models/clusters/applications/runner.rb index f1df7d570db..16efe90fa27 100644 --- a/app/models/clusters/applications/runner.rb +++ b/app/models/clusters/applications/runner.rb @@ -56,15 +56,13 @@ module Clusters def specification { "gitlabUrl" => gitlab_url, - "runnerToken" => ensure_runner.token + "runnerToken" => ensure_runner.token, + "runners" => { "privileged" => privileged } } end def content_values - chart_values = YAML.load_file(chart_values_file) - chart_values.merge!(specification) - chart_values["runners"]["privileged"] = privileged - chart_values + YAML.load_file(chart_values_file).deep_merge!(specification) end end end |