Merge "Fix temporary chart directory name for helm 3.9.4"
This commit is contained in:
commit
c957b80b88
@ -14,6 +14,8 @@ import os
|
|||||||
import psutil
|
import psutil
|
||||||
import ruamel.yaml as yaml
|
import ruamel.yaml as yaml
|
||||||
import tempfile
|
import tempfile
|
||||||
|
import random
|
||||||
|
import string
|
||||||
import threading
|
import threading
|
||||||
import zlib
|
import zlib
|
||||||
|
|
||||||
@ -164,6 +166,23 @@ def delete_helm_release(release, namespace="default", flags=None):
|
|||||||
timer.cancel()
|
timer.cancel()
|
||||||
|
|
||||||
|
|
||||||
|
def create_tmp_chart_dir():
|
||||||
|
""" Create a helm-compatible temporary chart directory
|
||||||
|
|
||||||
|
Chart directory names must have only lower cases letters and
|
||||||
|
numbers in order to be accepted as valid by Helm.
|
||||||
|
|
||||||
|
:returns: full path of the temporary directory created
|
||||||
|
"""
|
||||||
|
|
||||||
|
dir_name = ''.join(random.choices(
|
||||||
|
string.ascii_lowercase + string.digits, k=32))
|
||||||
|
dir_path = os.path.join(tempfile.gettempdir(), dir_name)
|
||||||
|
os.mkdir(dir_path)
|
||||||
|
|
||||||
|
return dir_path
|
||||||
|
|
||||||
|
|
||||||
def install_helm_chart_with_dry_run(args=None):
|
def install_helm_chart_with_dry_run(args=None):
|
||||||
"""Simulate a chart install
|
"""Simulate a chart install
|
||||||
|
|
||||||
@ -183,7 +202,7 @@ def install_helm_chart_with_dry_run(args=None):
|
|||||||
timer = None
|
timer = None
|
||||||
try:
|
try:
|
||||||
# Make a temporary directory with a fake chart in it
|
# Make a temporary directory with a fake chart in it
|
||||||
tmpdir = tempfile.mkdtemp()
|
tmpdir = create_tmp_chart_dir()
|
||||||
chartfile = tmpdir + '/Chart.yaml'
|
chartfile = tmpdir + '/Chart.yaml'
|
||||||
with open(chartfile, 'w') as tmpchart:
|
with open(chartfile, 'w') as tmpchart:
|
||||||
tmpchart.write('name: mychart\napiVersion: v1\n'
|
tmpchart.write('name: mychart\napiVersion: v1\n'
|
||||||
|
Loading…
Reference in New Issue
Block a user