starlingx
/
config
Code Issues Proposed changes

Merge "Correct helm override value setting, when the setting value is a digit" into r/stx.2.0

This commit is contained in:
Zuul 2019-08-12 15:24:28 +00:00 committed by Gerrit Code Review
parent 9e599bd801 8009752d4e
commit f0c2e14e11
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sysinv/sysinv/sysinv/sysinv/helm/helm.py
View File

@ -404,7 +404,16 @@ class HelmOperator(object):
cmd.extend(['--values', tmpfile.name])
for value_set in set_overrides:
cmd.extend(['--set', value_set])
keypair = list(value_set.split("="))
# request user to input with "--set key=value" or
# "--set key=", for the second case, the value is assume ""
# skip setting like "--set =value", "--set xxxx"
if len(keypair) == 2 and keypair[0]:
if keypair[1] and keypair[1].isdigit():
cmd.extend(['--set-string', value_set])
else:
cmd.extend(['--set', value_set])
env = os.environ.copy()
env['KUBECONFIG'] = '/etc/kubernetes/admin.conf'