From 53389ea67b18e0517cc0e6a5d1864e857f5d56b7 Mon Sep 17 00:00:00 2001
From: Felix Delattre <felix@developmentseed.org>
Date: Thu, 9 Jan 2025 15:05:21 +0100
Subject: [PATCH] Moved tf to main deploy directory.

---
 .../tofu => deploy/tf}/.terraform.lock.hcl          |   0
 .../jupyterhub/tofu => deploy/tf}/main.tf           |   0
 .../tofu => deploy/tf}/secrets/ovh-creds.sh         | Bin
 .../tofu => deploy/tf}/tests/test_permissions.py    |   0
 gfts-track-reconstruction/jupyterhub/README.md      |   2 +-
 gfts-track-reconstruction/jupyterhub/deploy.py      |   2 +-
 6 files changed, 2 insertions(+), 2 deletions(-)
 rename {gfts-track-reconstruction/jupyterhub/tofu => deploy/tf}/.terraform.lock.hcl (100%)
 rename {gfts-track-reconstruction/jupyterhub/tofu => deploy/tf}/main.tf (100%)
 rename {gfts-track-reconstruction/jupyterhub/tofu => deploy/tf}/secrets/ovh-creds.sh (100%)
 rename {gfts-track-reconstruction/jupyterhub/tofu => deploy/tf}/tests/test_permissions.py (100%)

diff --git a/gfts-track-reconstruction/jupyterhub/tofu/.terraform.lock.hcl b/deploy/tf/.terraform.lock.hcl
similarity index 100%
rename from gfts-track-reconstruction/jupyterhub/tofu/.terraform.lock.hcl
rename to deploy/tf/.terraform.lock.hcl
diff --git a/gfts-track-reconstruction/jupyterhub/tofu/main.tf b/deploy/tf/main.tf
similarity index 100%
rename from gfts-track-reconstruction/jupyterhub/tofu/main.tf
rename to deploy/tf/main.tf
diff --git a/gfts-track-reconstruction/jupyterhub/tofu/secrets/ovh-creds.sh b/deploy/tf/secrets/ovh-creds.sh
similarity index 100%
rename from gfts-track-reconstruction/jupyterhub/tofu/secrets/ovh-creds.sh
rename to deploy/tf/secrets/ovh-creds.sh
diff --git a/gfts-track-reconstruction/jupyterhub/tofu/tests/test_permissions.py b/deploy/tf/tests/test_permissions.py
similarity index 100%
rename from gfts-track-reconstruction/jupyterhub/tofu/tests/test_permissions.py
rename to deploy/tf/tests/test_permissions.py
diff --git a/gfts-track-reconstruction/jupyterhub/README.md b/gfts-track-reconstruction/jupyterhub/README.md
index dea0756..25b8a71 100644
--- 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
index e0befd5..2c14f17 100644
--- 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"