diff options
author | Dylan Griffith <dyl.griffith@gmail.com> | 2018-07-25 16:37:14 +0100 |
---|---|---|
committer | Dylan Griffith <dyl.griffith@gmail.com> | 2018-07-30 13:08:32 +0000 |
commit | ca35eb47b7e81846a3de2b918715576b342bab6a (patch) | |
tree | 86a3bd9a92ba601867d1c8a3277ce7b66fd0571e | |
parent | dc8ccbb6e0b9e14ff90e34661beee01da33008c7 (diff) | |
download | gitlab-ce-ca35eb47b7e81846a3de2b918715576b342bab6a.tar.gz |
Minor refactoring of InitCommand and InstallCommand
-rw-r--r-- | lib/gitlab/kubernetes/helm/init_command.rb | 4 | ||||
-rw-r--r-- | lib/gitlab/kubernetes/helm/install_command.rb | 18 |
2 files changed, 12 insertions, 10 deletions
diff --git a/lib/gitlab/kubernetes/helm/init_command.rb b/lib/gitlab/kubernetes/helm/init_command.rb index d26e827b26c..a4546509515 100644 --- a/lib/gitlab/kubernetes/helm/init_command.rb +++ b/lib/gitlab/kubernetes/helm/init_command.rb @@ -20,12 +20,12 @@ module Gitlab private def init_helm_command - tls_opts = "--tiller-tls" \ + tls_flags = "--tiller-tls" \ " --tiller-tls-verify --tls-ca-cert #{files_dir}/ca.pem" \ " --tiller-tls-cert #{files_dir}/cert.pem" \ " --tiller-tls-key #{files_dir}/key.pem" - "helm init #{tls_opts} >/dev/null" + "helm init #{tls_flags} >/dev/null" end end end diff --git a/lib/gitlab/kubernetes/helm/install_command.rb b/lib/gitlab/kubernetes/helm/install_command.rb index 452c0b36a22..555b9a7fdb4 100644 --- a/lib/gitlab/kubernetes/helm/install_command.rb +++ b/lib/gitlab/kubernetes/helm/install_command.rb @@ -34,21 +34,23 @@ module Gitlab end def script_command - if files.key?(:'ca.pem') - tls_opts = " --tls" \ - " --tls-ca-cert #{files_dir}/ca.pem" \ - " --tls-cert #{files_dir}/cert.pem" \ - " --tls-key #{files_dir}/key.pem" - end - <<~HEREDOC - helm install#{tls_opts} #{chart} --name #{name}#{optional_version_flag} --namespace #{Gitlab::Kubernetes::Helm::NAMESPACE} -f /data/helm/#{name}/config/values.yaml >/dev/null + helm install#{optional_tls_flags} #{chart} --name #{name}#{optional_version_flag} --namespace #{Gitlab::Kubernetes::Helm::NAMESPACE} -f /data/helm/#{name}/config/values.yaml >/dev/null HEREDOC end def optional_version_flag " --version #{version}" if version end + + def optional_tls_flags + if files.key?(:'ca.pem') + " --tls" \ + " --tls-ca-cert #{files_dir}/ca.pem" \ + " --tls-cert #{files_dir}/cert.pem" \ + " --tls-key #{files_dir}/key.pem" + end + end end end end |