Skip to content

Commit 400b704

Browse files
committed
fix(clean): mistake delete new resource service
1 parent 687ce57 commit 400b704

5 files changed

Lines changed: 3 additions & 21 deletions

File tree

build.sh

Lines changed: 0 additions & 13 deletions
This file was deleted.

rootfs/helmbroker/broker.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ def update(self,
150150
raise ErrBadRequest(
151151
msg="Instance %s does not updateable" % instance_id)
152152
allow_paras = get_addon_allow_paras(details.service_id)
153-
logger.debug(f"service instance update parameters: {details.parameters}")
153+
logger.debug(f"service instance update parameters: {details.parameters}") # noqa
154154
not_allow_keys = verify_parameters(allow_paras, details.parameters)
155155
if not_allow_keys:
156156
raise ErrBadRequest(

rootfs/helmbroker/cleaner.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
from openbrokerapi.service_broker import OperationState
77

88
from .config import INSTANCES_PATH
9-
from .tasks import deprovision
109
from .utils import get_instance_file, load_instance_meta
1110

1211
logger = logging.getLogger(__name__)
@@ -21,10 +20,6 @@ def clean_instance():
2120
interval = time.time() - data["last_modified_time"]
2221
state = data["last_operation"]["state"]
2322
operation = data["last_operation"]["operation"]
24-
if interval > 3600 * 24 and (
25-
operation == "deprovision"
26-
and state != OperationState.SUCCEEDED):
27-
deprovision.delay(instance_id)
2823
if operation == "deprovision":
2924
if state == OperationState.SUCCEEDED or (
3025
interval > 3600 * 24

rootfs/helmbroker/tasks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ def update(instance_id: str, details: UpdateDetails):
7979
# remove the key which value is null
8080
data['details']['parameters'] = {k: v for k, v in paras.items() if v != ""} # noqa
8181
data['last_operation']["state"] = OperationState.IN_PROGRESS.value
82-
data['last_operation']["description"] = "update %s in progress at %s" % (instance_id, time.time())
82+
data['last_operation']["description"] = "update %s in progress at %s" % (instance_id, time.time()) # noqa
8383
dump_instance_meta(instance_id, data)
8484
chart_path = get_chart_path(instance_id)
8585
values_file = os.path.join(get_plan_path(instance_id), "values.yaml")

rootfs/helmbroker/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ def dump_addon_values(service_id, instance_id):
111111
with open(f'{CONFIG_PATH}/addon-values', 'r') as f:
112112
addon_values = yaml.load(f.read(), Loader=yaml.Loader)
113113
f.write(yaml.dump(
114-
addon_values.get(service["name"], {}).get(service["version"], {})
114+
addon_values.get(service["name"], {}).get(service["version"], {}) # noqa
115115
))
116116
return file
117117

0 commit comments

Comments
 (0)