From 631ab89885c99c6bec348a884c40d9f4214c6878 Mon Sep 17 00:00:00 2001 From: Amit Rathi Date: Tue, 13 Nov 2018 20:36:06 +0530 Subject: Use email on the account --- lib/gitlab/kubernetes/helm/install_command.rb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'lib/gitlab/kubernetes') diff --git a/lib/gitlab/kubernetes/helm/install_command.rb b/lib/gitlab/kubernetes/helm/install_command.rb index e55c86ed8b1..e77f8bc7ab8 100644 --- a/lib/gitlab/kubernetes/helm/install_command.rb +++ b/lib/gitlab/kubernetes/helm/install_command.rb @@ -4,9 +4,9 @@ module Gitlab class InstallCommand include BaseCommand - attr_reader :name, :files, :chart, :version, :repository, :preinstall, :postinstall + attr_reader :name, :files, :chart, :version, :repository, :preinstall, :postinstall, :application_flags - def initialize(name:, chart:, files:, rbac:, version: nil, repository: nil, preinstall: nil, postinstall: nil) + def initialize(name:, chart:, files:, rbac:, version: nil, repository: nil, preinstall: nil, postinstall: nil, application_flags: []) @name = name @chart = chart @version = version @@ -15,6 +15,7 @@ module Gitlab @repository = repository @preinstall = preinstall @postinstall = postinstall + @application_flags = application_flags end def generate_script @@ -64,16 +65,14 @@ module Gitlab name_flag = ['--name', name] namespace_flag = ['--namespace', Gitlab::Kubernetes::Helm::NAMESPACE] value_flag = ['-f', "/data/helm/#{name}/config/values.yaml"] - a = ['--set', 'ingressShim.defaultIssuerName=letsencrypt-prod'] - b = ['--set', 'ingressShim.defaultIssuerKind=ClusterIssuer'] - c = ['--set', 'rbac.create=false'] name_flag + optional_tls_flags + optional_version_flag + optional_rbac_create_flag + namespace_flag + - value_flag + a + b + c + value_flag + + application_flags end def optional_rbac_create_flag -- cgit v1.2.1