summaryrefslogtreecommitdiff
path: root/lib/quality
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-21 18:06:26 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-21 18:06:26 +0000
commit7aada820a908502f40080274fb181281afd44615 (patch)
treee82fbe264cb5d410fce7acea0a7fd74a962952ba /lib/quality
parentb5ad06174bb1de39438c90847abb86ac6988e944 (diff)
downloadgitlab-ce-7aada820a908502f40080274fb181281afd44615.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/quality')
-rw-r--r--lib/quality/helm_client.rb9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/quality/helm_client.rb b/lib/quality/helm_client.rb
index cf1f03b35b5..fc4e1ca2d18 100644
--- a/lib/quality/helm_client.rb
+++ b/lib/quality/helm_client.rb
@@ -7,7 +7,7 @@ module Quality
class HelmClient
CommandFailedError = Class.new(StandardError)
- attr_reader :namespace
+ attr_reader :tiller_namespace, :namespace
RELEASE_JSON_ATTRIBUTES = %w[Name Revision Updated Status Chart AppVersion Namespace].freeze
@@ -24,7 +24,8 @@ module Quality
# A single page of data and the corresponding page number.
Page = Struct.new(:releases, :number)
- def initialize(namespace:)
+ def initialize(tiller_namespace:, namespace:)
+ @tiller_namespace = tiller_namespace
@namespace = namespace
end
@@ -35,7 +36,7 @@ module Quality
def delete(release_name:)
run_command([
'delete',
- %(--tiller-namespace "#{namespace}"),
+ %(--tiller-namespace "#{tiller_namespace}"),
'--purge',
release_name
])
@@ -60,7 +61,7 @@ module Quality
command = [
'list',
%(--namespace "#{namespace}"),
- %(--tiller-namespace "#{namespace}" --output json),
+ %(--tiller-namespace "#{tiller_namespace}" --output json),
*args
]
json = JSON.parse(run_command(command))