diff options
author | Chris Baumbauer <cab@cabnetworks.net> | 2018-11-03 10:48:48 -0700 |
---|---|---|
committer | Chris Baumbauer <cab@cabnetworks.net> | 2018-11-03 10:48:48 -0700 |
commit | c10452d285134b7eac63551f5a09606fb5d4f5e0 (patch) | |
tree | ad88609384b75b54cef8df28c794333189b9ab8b /lib | |
parent | aa44393e8f6e428bb7159ac8815a143a9e3e1047 (diff) | |
download | gitlab-ce-c10452d285134b7eac63551f5a09606fb5d4f5e0.tar.gz |
Resolve issues raised by Kamil
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/kubernetes/helm/install_command.rb | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/lib/gitlab/kubernetes/helm/install_command.rb b/lib/gitlab/kubernetes/helm/install_command.rb index aa5fddf1b44..09a4e494b64 100644 --- a/lib/gitlab/kubernetes/helm/install_command.rb +++ b/lib/gitlab/kubernetes/helm/install_command.rb @@ -4,16 +4,15 @@ module Gitlab class InstallCommand include BaseCommand - attr_reader :name, :files, :chart, :version, :repository, :setargs, :script + attr_reader :name, :files, :chart, :version, :repository, :script - def initialize(name:, chart:, files:, rbac:, version: nil, repository: nil, setargs: nil, script: nil) + def initialize(name:, chart:, files:, rbac:, version: nil, repository: nil, script: nil) @name = name @chart = chart @version = version @rbac = rbac @files = files @repository = repository - @setargs = setargs @script = script end @@ -61,15 +60,13 @@ module Gitlab name_flag = ['--name', name] namespace_flag = ['--namespace', Gitlab::Kubernetes::Helm::NAMESPACE] value_flag = ['-f', "/data/helm/#{name}/config/values.yaml"] - args_flag = optional_install_set_args_flag name_flag + optional_tls_flags + optional_version_flag + optional_rbac_create_flag + namespace_flag + - value_flag + - args_flag + value_flag end def optional_rbac_create_flag @@ -80,16 +77,6 @@ module Gitlab %w[--set rbac.create=true,rbac.enabled=true] end - def optional_install_set_args_flag - return [] unless setargs - - args = [] - setargs.each do |s| - args.push("--set", s) - end - args - end - def optional_version_flag return [] unless version |