diff --git a/dk-installer.py b/dk-installer.py index c100cc3..799746e 100755 --- a/dk-installer.py +++ b/dk-installer.py @@ -1209,6 +1209,7 @@ def on_action_fail(self, action, args): class ObsHelmInstallServicesStep(HelmInstallStep): label = "Installing helm charts for supporting services" chart_info = HELM_SERVICES + values_arg = "svc_values" class ObsHelmInstallPlatformStep(HelmInstallStep): @@ -1283,6 +1284,7 @@ def on_action_success(self, action, args): self._collect_images_sha(action, args) def on_action_fail(self, action, args): + super().on_action_fail(action, args) self._collect_images_sha(action, args) def _collect_images_sha(self, action, args): @@ -1426,11 +1428,17 @@ def get_parser(self, sub_parsers): "Defaults to '%(default)s'" ), ) + parser.add_argument( + "--svc-values", + type=str, + action="store", + help="Override values for supporting services Helm install. Specify path to a YAML file or URL.", + ) parser.add_argument( "--app-values", type=str, action="store", - help="Override values for Helm app install. Specify path to a YAML file or URL.", + help="Override values for app Helm install. Specify path to a YAML file or URL.", ) parser.add_argument( "--docker-username", diff --git a/tests/conftest.py b/tests/conftest.py index 0714b5a..295f24f 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -181,6 +181,7 @@ def args_mock(): ns.driver = "docker" ns.memory = "4096m" ns.helm_timeout = 10 + ns.svc_values = None ns.app_values = None ns.docker_username = None ns.docker_password = None