Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMayra Cabrera <mcabrera@gitlab.com>2018-03-06 11:26:50 +0300
committerKamil TrzciƄski <ayufan@ayufan.eu>2018-03-06 11:26:50 +0300
commit7237ed59ac90148945efebf9624949c80c1298a4 (patch)
treef90e1dc83cb22117aa50bef46664c17d69edfa5c /app/models/clusters
parent2e87923dcb1cf7984690f5b5fdfc61bddfba923e (diff)
Resolve "Enable privileged mode for Runner installed on Kubernetes"
Diffstat (limited to 'app/models/clusters')
-rw-r--r--app/models/clusters/applications/runner.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/models/clusters/applications/runner.rb b/app/models/clusters/applications/runner.rb
index 7adf1663c35..16efe90fa27 100644
--- a/app/models/clusters/applications/runner.rb
+++ b/app/models/clusters/applications/runner.rb
@@ -56,12 +56,13 @@ module Clusters
def specification
{
"gitlabUrl" => gitlab_url,
- "runnerToken" => ensure_runner.token
+ "runnerToken" => ensure_runner.token,
+ "runners" => { "privileged" => privileged }
}
end
def content_values
- specification.merge(YAML.load_file(chart_values_file))
+ YAML.load_file(chart_values_file).deep_merge!(specification)
end
end
end