Skip to content

Commit 5cb41a0

Browse files
Run precommit
1 parent eb65be5 commit 5cb41a0

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

docker/mongodb-kubernetes-tests/kubetester/helm.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -308,12 +308,11 @@ def _helm_chart_dir(default: Optional[str] = "helm_chart") -> str:
308308
# to install MEKO's specific version or MCK's specific version, we would expec `helm_chart_path` to set already.
309309
def helm_chart_path_and_version(helm_chart_path: str, operator_version: str) -> tuple[str, str]:
310310
# these are imported here to resolve import cycle issue
311-
from tests.conftest import local_operator
312-
from tests.conftest import LOCAL_HELM_CHART_DIR
311+
from tests.conftest import LOCAL_HELM_CHART_DIR, local_operator
313312

314313
if local_operator():
315314
return LOCAL_HELM_CHART_DIR, ""
316-
315+
317316
# if operator_version is not specified and we are not installing the MCK or MEKO chart
318317
# it would mean we want to install OCI published helm chart. Figure out respective version,
319318
# it is set in env var `OPERATOR_VERSION` based on build_scenario.
@@ -326,7 +325,6 @@ def helm_chart_path_and_version(helm_chart_path: str, operator_version: str) ->
326325
# here https://docs.google.com/document/d/1eJ8iKsI0libbpcJakGjxcPfbrTn8lmcZDbQH1UqMR_g/edit?tab=t.gg5ble8qlesq
327326
operator_version = f"0.0.0+{non_semver_operator_version}"
328327

329-
330328
# helm_chart_path not being passed would mean we are on evg env and would like to
331329
# install helm chart from OCI registry.
332330
if not helm_chart_path:

docker/mongodb-kubernetes-tests/kubetester/operator.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
from kubetester.consts import *
1414
from kubetester.create_or_replace_from_yaml import create_or_replace_from_yaml
1515
from kubetester.helm import (
16+
helm_chart_path_and_version,
1617
helm_install,
1718
helm_repo_add,
1819
helm_template,
1920
helm_uninstall,
2021
helm_upgrade,
2122
oci_chart_info,
2223
oci_helm_registry_login,
23-
helm_chart_path_and_version,
2424
)
2525
from tests import test_logger
2626

@@ -57,7 +57,7 @@ def __init__(
5757
# The Operator will be installed from the following repo, so adding it first
5858
helm_repo_add("mongodb", "https://mongodb.github.io/helm-charts")
5959

60-
helm_chart_path, operator_version = helm_chart_path_and_version(helm_chart_path, operator_version)
60+
helm_chart_path, operator_version = helm_chart_path_and_version(helm_chart_path, operator_version)
6161

6262
if helm_args is None:
6363
helm_args = {}

docker/mongodb-kubernetes-tests/tests/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
from kubetester.awss3client import AwsS3Client
2323
from kubetester.consts import *
2424
from kubetester.helm import (
25+
helm_chart_path_and_version,
2526
helm_install_from_chart,
2627
helm_repo_add,
2728
oci_chart_info,
2829
oci_helm_registry_login,
29-
helm_chart_path_and_version,
3030
)
3131
from kubetester.kubetester import KubernetesTester
3232
from kubetester.kubetester import fixture as _fixture

0 commit comments

Comments
 (0)