Skip to content

Commit 3d17e5f

Browse files
committed
chore(helmbroker): fixup extract_tgz path
1 parent 4ce1be9 commit 3d17e5f

2 files changed

Lines changed: 10 additions & 3 deletions

File tree

rootfs/helmbroker/loader.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ def load_addons(repository):
105105
addon_tgz_url = f'{url}/{tgz_name}.tgz'
106106
download_file(addon_tgz_url, ADDONS_PATH)
107107
extract_tgz(f'{ADDONS_PATH}/{tgz_name}.tgz',
108-
f'{ADDONS_PATH}/{tgz_name}')
108+
f'{ADDONS_PATH}')
109109
addons_meta_file()
110110

111111

rootfs/helmbroker/tasks.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import time
33
import shutil
44
import yaml
5+
import logging
56

67
from openbrokerapi.service_broker import ProvisionDetails, OperationState, \
78
UpdateDetails, BindDetails
@@ -11,6 +12,8 @@
1112
InstanceLock, dump_instance_meta, dump_binding_meta, load_instance_meta, \
1213
get_instance_file, helm
1314

15+
logger = logging.getLogger(__name__)
16+
1417

1518
@app.task(serializer='pickle')
1619
def provision(instance_id: str, details: ProvisionDetails):
@@ -42,7 +45,10 @@ def provision(instance_id: str, details: ProvisionDetails):
4245
"--set",
4346
f"fullnameOverride=helmbroker-{details.context['instance_name']}"
4447
]
45-
48+
logger.info(f"helm install parameters :{details.parameters}")
49+
logger.info(f"helm install parameters type:{type(details.parameters)}")
50+
# for k, v in details.parameters:
51+
# args.append("--set", k, v)
4652
status, output = helm(instance_id, *args)
4753
data = load_instance_meta(instance_id)
4854
if status != 0:
@@ -90,7 +96,8 @@ def update(instance_id: str, details: UpdateDetails):
9096
"--set",
9197
f"fullnameOverride=helmbroker-{details.context['instance_name']}"
9298
]
93-
99+
logger.info(f"helm upgrade parameters: {details.parameters}")
100+
logger.info(f"helm upgrade parameters type: {type(details.parameters)}")
94101
status, output = helm(instance_id, *args)
95102
if status != 0:
96103
data["last_operation"]["state"] = OperationState.FAILED.value

0 commit comments

Comments
 (0)