From b268a34afcaf8162818e305ac4dd8223057860a8 Mon Sep 17 00:00:00 2001
From: Doug Goldstein <doug.goldstein@rackspace.com>
Date: Mon, 16 Sep 2024 11:45:01 -0500
Subject: [PATCH] docs: make the install paths easier to use

Attempt to make the install paths easier to use by sticking to the
deploy repo checkout.
---
 docs/deploy-guide/gitops-install.md | 19 ++++++-------------
 scripts/gitops-secrets-gen.sh       |  2 +-
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/docs/deploy-guide/gitops-install.md b/docs/deploy-guide/gitops-install.md
index 5e1aa6a3..28512317 100644
--- a/docs/deploy-guide/gitops-install.md
+++ b/docs/deploy-guide/gitops-install.md
@@ -129,12 +129,9 @@ has been chosen; other tools like Vault, SOPS, etc should be considered
 for production deployments.
 
 ```bash
-# from your understack checkout
-./scripts/gitops-secrets-gen.sh ${UC_DEPLOY}/my-k3s.env
-pushd "${UC_DEPLOY}"
-git add my-k3s
-git commit -m "my-k3s: secrets generation"
-popd
+./scripts/gitops-secrets-gen.sh ./my-k3s.env
+git -C "${UC_DEPLOY}" add secrets/my-k3s
+git -C "${UC_DEPLOY}" commit -m "my-k3s: secrets generation"
 ```
 
 ### Defining the app deployment
@@ -143,12 +140,9 @@ In this section we will use the [App of Apps][app-of-apps] pattern to define
 the deployment of all the components of UnderStack.
 
 ```bash
-# from your understack checkout
 ./scripts/gitops-deploy.sh ${UC_DEPLOY}/my-k3s.env
-pushd "${UC_DEPLOY}"
-git add my-k3s
-git commit -m "my-k3s: initial cluster config"
-popd
+git -C "${UC_DEPLOY}" add helm-configs/my-k3s
+git -C "${UC_DEPLOY}" commit -m "my-k3s: initial cluster config"
 ```
 
 ## Final modifications of your deployment
@@ -192,8 +186,7 @@ kubectl label node $(kubectl get nodes -o 'jsonpath={.items[*].metadata.name}')
 Finally run the following to have ArgoCD deploy the system:
 
 ```bash
-# from your understack checkout
-kubectl apply -f apps/aio-app-of-apps.yaml
+kubectl -n argocd apply -f apps/aio-app-of-apps.yaml
 ```
 
 At this point ArgoCD will work to deploy Understack.
diff --git a/scripts/gitops-secrets-gen.sh b/scripts/gitops-secrets-gen.sh
index d17ec8e3..ccd05ed0 100755
--- a/scripts/gitops-secrets-gen.sh
+++ b/scripts/gitops-secrets-gen.sh
@@ -351,7 +351,7 @@ export HORIZON_DB_PASSWORD
 # this is a helm values.yaml but it contains secrets because of the lack
 # of secrets references in OpenStack Helm
 yq '(.. | select(tag == "!!str")) |= envsubst' \
-    "./components/openstack-secrets.tpl.yaml" \
+    "${SCRIPTS_DIR}/../components/openstack-secrets.tpl.yaml" \
     > "${DEST_DIR}/secret-openstack.yaml"
 
 echo "Checking undersync"