From fa8d2b426ee81ea8a5b36bb6e81e0950683d7fef Mon Sep 17 00:00:00 2001 From: Toni Finger Date: Mon, 25 Nov 2024 17:06:17 +0100 Subject: [PATCH] Add envsubst to requirements Signed-off-by: Toni Finger --- Tests/kaas/README.md | 5 ----- Tests/kaas/plugin/plugin_cluster_stacks_remote_api.py | 2 +- Tests/kaas/requirements.in | 1 + Tests/kaas/requirements.txt | 4 +++- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Tests/kaas/README.md b/Tests/kaas/README.md index 6a9737dda..9640d8ff4 100644 --- a/Tests/kaas/README.md +++ b/Tests/kaas/README.md @@ -48,11 +48,6 @@ In addition to the core requirements, ensure the following are set up: * An **OpenStack** environment configured and accessible. * A `clouds.yaml` file defining OpenStack credentials and endpoints. -* An installing the envsubst via this command: - - ```bash - GOBIN=/tmp go install github.com/drone/envsubst/v2/cmd/envsubst@latest - ``` ### Environment Variables diff --git a/Tests/kaas/plugin/plugin_cluster_stacks_remote_api.py b/Tests/kaas/plugin/plugin_cluster_stacks_remote_api.py index ff4661b0f..25d0eb857 100644 --- a/Tests/kaas/plugin/plugin_cluster_stacks_remote_api.py +++ b/Tests/kaas/plugin/plugin_cluster_stacks_remote_api.py @@ -196,7 +196,7 @@ def _apply_yaml(self, yaml_file, error_msg, kubeconfig=None): try: # Determine if the file is a local path or a URL if os.path.isfile(yaml_file): - command = f"/tmp/envsubst < {yaml_file} | kubectl apply -f -" + command = f"envsubst < {yaml_file} | kubectl apply -f -" else: raise ValueError(f"Unknown file: {yaml_file}") diff --git a/Tests/kaas/requirements.in b/Tests/kaas/requirements.in index 640831e54..bf8cc3f50 100644 --- a/Tests/kaas/requirements.in +++ b/Tests/kaas/requirements.in @@ -1,3 +1,4 @@ pytest-kind kubernetes junitparser +envsubst diff --git a/Tests/kaas/requirements.txt b/Tests/kaas/requirements.txt index c36ca21d1..b85b94cc7 100644 --- a/Tests/kaas/requirements.txt +++ b/Tests/kaas/requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # pip-compile requirements.in @@ -12,6 +12,8 @@ certifi==2024.8.30 # requests charset-normalizer==3.3.2 # via requests +envsubst==0.1.5 + # via -r requirements.in google-auth==2.34.0 # via kubernetes idna==3.8