Merge pull request #128 from destination-earth/feature/deploy-move-tf

Move tf to main deploy directory.
destination-earth · Jan 13, 2025 · 9f66a45 · 9f66a45
2 parents 149b7fc + 53389ea
commit 9f66a45
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 2 deletions.
diff --git a/...ction/jupyterhub/tofu/.terraform.lock.hcl → deploy/tf/.terraform.lock.hcl b/...ction/jupyterhub/tofu/.terraform.lock.hcl → deploy/tf/.terraform.lock.hcl
diff --git a/...ck-reconstruction/jupyterhub/tofu/main.tf → deploy/tf/main.tf b/...ck-reconstruction/jupyterhub/tofu/main.tf → deploy/tf/main.tf
diff --git a/...tion/jupyterhub/tofu/secrets/ovh-creds.sh → deploy/tf/secrets/ovh-creds.sh b/...tion/jupyterhub/tofu/secrets/ovh-creds.sh → deploy/tf/secrets/ovh-creds.sh
diff --git a/...jupyterhub/tofu/tests/test_permissions.py → deploy/tf/tests/test_permissions.py b/...jupyterhub/tofu/tests/test_permissions.py → deploy/tf/tests/test_permissions.py
diff --git a/gfts-track-reconstruction/jupyterhub/README.md b/gfts-track-reconstruction/jupyterhub/README.md
@@ -12,7 +12,7 @@ Initial manual steps:
 1. create bucket for storing tofu state. Create user and store in `secrets/ovh-creds.sh`, and put bucket name in s3 backend configuration
 2. create API token for OVH API, store in `secrets/ovh-creds.sh`
 
-Next, run tofu, which will create the kubernetes cluster
+Next, run tofu within the `/deploy/tf` directory, which will create the kubernetes cluster
 
 ```bash
 tofu init

diff --git a/gfts-track-reconstruction/jupyterhub/deploy.py b/gfts-track-reconstruction/jupyterhub/deploy.py
@@ -14,7 +14,7 @@
 import click
 
 jupyterhub = Path(__file__).parent.absolute()
-tofu = jupyterhub / "tofu"
+tofu = jupyterhub.parent.parent / "deploy" / "tf"
 kube_config = jupyterhub / "secrets" / "kubeconfig.yaml"