Skip to content

Remove def _helm_chart_dir that used undefined env var #535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove def _helm_chart_dir that used undefined env var #535

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions docker/mongodb-kubernetes-tests/kubetester/helm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def helm_template(
command_args.append("--show-only")
command_args.append(templates)

args = ("helm", "template", *(command_args), _helm_chart_dir(helm_chart_path))
args = ("helm", "template", *(command_args), helm_chart_path)
logger.info(" ".join(args))

yaml_file_name = "{}.yaml".format(str(uuid.uuid4()))
Expand All @@ -51,7 +51,7 @@ def helm_install(
f"--namespace={namespace}",
*command_args,
name,
_helm_chart_dir(helm_chart_path),
helm_chart_path,
]
if custom_operator_version:
args.append(f"--version={custom_operator_version}")
Expand Down Expand Up @@ -159,7 +159,7 @@ def helm_upgrade(
logger.warning("Helm chart path is empty, defaulting to 'helm_chart'")
helm_chart_path = "helm_chart"

chart_dir = helm_chart_path if helm_override_path else _helm_chart_dir(helm_chart_path)
chart_dir = helm_chart_path

if apply_crds_first:
apply_crds_from_chart(chart_dir)
Expand Down Expand Up @@ -230,7 +230,3 @@ def _create_helm_args(helm_args: Dict[str, str], helm_options: Optional[List[str
command_args.extend(helm_options)

return command_args


def _helm_chart_dir(default: Optional[str] = "helm_chart") -> str:
return os.environ.get("HELM_CHART_DIR", default)