From 7565395584ddd88404963a72cfbca1c573299671 Mon Sep 17 00:00:00 2001 From: Yash Pankhania Date: Mon, 14 Apr 2025 12:02:26 +1000 Subject: [PATCH 1/2] Simplify mysql step of dev deploy and add docs for copying images The docs suggested passing mysql options as arguments and the values had to be extracted from the config file. A cleaner way is to just pass the config file instead. We also did not have the docs to explain how to copy images into the Artifact Registry, which has now been added. --- hail.md | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/hail.md b/hail.md index fe7f4f6..60def6d 100644 --- a/hail.md +++ b/hail.md @@ -246,9 +246,7 @@ There are 3 categories of machines: ```bash cd /sql-config cat /sql-config/sql-config.cnf - export NAMESPACE="" - export HOST="" - mysql --ssl-ca=server-ca.pem --ssl-cert=client-cert.pem --ssl-key=client-key.pem --host=$HOST --user=$NAMESPACE-auth-user --password + mysql --defaults-file=/sql-config/sql-config.cnf ``` 1. Within `mysql>`, run the following, but note that you'll have to replace `$NAMESPACE`, `$EMAIL`, and `$TOKEN` manually: @@ -544,6 +542,23 @@ cd infra terraform apply -var-file=global.tfvars ``` +### Copy an image to the Artifact Registry (Optional) + +In the event that you may need to copy over an image to our Artifact Registry, you can launch the `hail-dev` VM which has `skopeo` installed: + +```bash +cd docker/third-party +make copy NAMESPACE=default +``` + +You can also inspect the following files for more fine grained control over what/how you are copying: + +```txt +- docker/third-party/Makefile +- docker/third-party/copy_images.sh +- docker/copy_image.sh +``` + ### Billing projects > See [Budgets](budgets.md) for more info From 2b715433b7ada8c7438becb1e8a85d6a95104a40 Mon Sep 17 00:00:00 2001 From: John Marshall Date: Tue, 17 Feb 2026 09:51:49 +1300 Subject: [PATCH 2/2] Wordsmithing --- hail.md | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/hail.md b/hail.md index 60def6d..2f7a3b0 100644 --- a/hail.md +++ b/hail.md @@ -241,11 +241,9 @@ There are 3 categories of machines: kubectl --namespace $NAMESPACE exec -it auth-6d559bd9b6-npw56 -- /bin/bash ``` - 1. On the pod, connect to the SQL instance and set the `$NAMESPACE` variable (the one you exported earlier is not available to the pod). From `sql-config.cnf`, set the variable `$HOST`, and note the `password`. You may need to install the mysql client if the command isn't available, this can be done with `apt update` and `apt install mysql-client`. + 1. On the pod, connect to the SQL instance. You may need to install the mysql client if the command isn't available, this can be done with `apt update` and `apt install mysql-client`. ```bash - cd /sql-config - cat /sql-config/sql-config.cnf mysql --defaults-file=/sql-config/sql-config.cnf ``` @@ -362,7 +360,7 @@ kubectl --namespace $NAMESPACE exec -it $POD -- /bin/bash # connect to the database: apt update && apt install -y mysql-client -mysql --defaults-file=sql-config/sql-config.cnf +mysql --defaults-file=/sql-config/sql-config.cnf ``` ### Syncing local changes to pod @@ -527,7 +525,7 @@ Once in, install mysql-client and open SQL client connection: ```bash apt update && apt install mysql-client -mysql --defaults-file=sql-config/sql-config.cnf +mysql --defaults-file=/sql-config/sql-config.cnf # execute your SQL command ``` @@ -547,11 +545,12 @@ terraform apply -var-file=global.tfvars In the event that you may need to copy over an image to our Artifact Registry, you can launch the `hail-dev` VM which has `skopeo` installed: ```bash +cd ...your hail checkout... cd docker/third-party -make copy NAMESPACE=default +make NAMESPACE=default copy ``` -You can also inspect the following files for more fine grained control over what/how you are copying: +You can also inspect the following files for more fine-grained control over what/how you are copying: ```txt - docker/third-party/Makefile