Skip to content

Commit 18a5de9

Browse files
committed
chore(helmbroker): update parameters
1 parent 3d17e5f commit 18a5de9

2 files changed

Lines changed: 11 additions & 3 deletions

File tree

rootfs/helmbroker/broker.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import os
22
import time
33
import shutil
4+
import logging
45
from typing import Union, List, Optional
56

67
from openbrokerapi.catalog import ServicePlan
@@ -19,6 +20,8 @@
1920
load_addons_meta
2021
from .tasks import provision, bind, deprovision, update
2122

23+
logger = logging.getLogger(__name__)
24+
2225

2326
class HelmServiceBroker(ServiceBroker):
2427

@@ -147,6 +150,8 @@ def update(self,
147150
details.service_id, details.plan_id)
148151
# add the new plan
149152
shutil.copytree(addon_plan_path, plan_path)
153+
logger.info(f"service update parameters: {details.parameters}")
154+
logger.info(f"service update parameters type: {type(details.parameters)}") # noqa
150155
update.delay(instance_id, details)
151156
return UpdateServiceSpec(is_async=True)
152157

rootfs/helmbroker/tasks.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,11 @@ def provision(instance_id: str, details: ProvisionDetails):
4545
"--set",
4646
f"fullnameOverride=helmbroker-{details.context['instance_name']}"
4747
]
48+
49+
for k, v in details.parameters:
50+
args.extend(["--set", f"{k}={v}"])
4851
logger.info(f"helm install parameters :{details.parameters}")
4952
logger.info(f"helm install parameters type:{type(details.parameters)}")
50-
# for k, v in details.parameters:
51-
# args.append("--set", k, v)
5253
status, output = helm(instance_id, *args)
5354
data = load_instance_meta(instance_id)
5455
if status != 0:
@@ -72,7 +73,7 @@ def update(instance_id: str, details: UpdateDetails):
7273
if details.context:
7374
data['details']['context'] = details.context
7475
if details.parameters:
75-
data['details']['service_id'] = details.parameters
76+
data['details']['parameters'] = details.parameters
7677
data['last_operation'] = {
7778
"state": OperationState.IN_PROGRESS.value,
7879
"description": (
@@ -96,6 +97,8 @@ def update(instance_id: str, details: UpdateDetails):
9697
"--set",
9798
f"fullnameOverride=helmbroker-{details.context['instance_name']}"
9899
]
100+
for k, v in details.parameters:
101+
args.extend(["--set", f"{k}={v}"])
99102
logger.info(f"helm upgrade parameters: {details.parameters}")
100103
logger.info(f"helm upgrade parameters type: {type(details.parameters)}")
101104
status, output = helm(instance_id, *args)

0 commit comments

Comments
 (0)