From 6b94c633dec3fcd81192154af18efd342fd5dc61 Mon Sep 17 00:00:00 2001
From: Trey Dockendorf <tdockendorf@osc.edu>
Date: Mon, 22 Mar 2021 09:48:28 -0400
Subject: [PATCH] Re-organize hooks

---
 .github/workflows/tests.yml                             | 2 +-
 hooks/{ => k8s-bootstrap}/k8s-bootstrap-ondemand.sh     | 2 +-
 hooks/{ => k8s-bootstrap}/ondemand.yaml                 | 0
 hooks/{ => k8s-bootstrap}/set-k8s-creds.sh              | 0
 hooks/k8s-bootstrap/{ => yaml}/job-pod-reaper.yaml      | 0
 hooks/k8s-bootstrap/{ => yaml}/namespace.yaml           | 0
 hooks/k8s-bootstrap/{ => yaml}/network-policy.yaml      | 0
 hooks/k8s-bootstrap/{ => yaml}/pod-security-policy.yaml | 0
 hooks/k8s-bootstrap/{ => yaml}/rolebinding.yaml         | 0
 lib/tasks/test.rb                                       | 2 +-
 10 files changed, 3 insertions(+), 3 deletions(-)
 rename hooks/{ => k8s-bootstrap}/k8s-bootstrap-ondemand.sh (97%)
 rename hooks/{ => k8s-bootstrap}/ondemand.yaml (100%)
 rename hooks/{ => k8s-bootstrap}/set-k8s-creds.sh (100%)
 rename hooks/k8s-bootstrap/{ => yaml}/job-pod-reaper.yaml (100%)
 rename hooks/k8s-bootstrap/{ => yaml}/namespace.yaml (100%)
 rename hooks/k8s-bootstrap/{ => yaml}/network-policy.yaml (100%)
 rename hooks/k8s-bootstrap/{ => yaml}/pod-security-policy.yaml (100%)
 rename hooks/k8s-bootstrap/{ => yaml}/rolebinding.yaml (100%)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index c31f6e7cdc..e1678c01d9 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -89,4 +89,4 @@ jobs:
           kubectl config use-context kind-kind
           kubectl cluster-info
       - name: Test k8s-bootstrap
-        run: /bin/bash hooks/k8s-bootstrap-ondemand.sh test hooks/hook.env.example
+        run: /bin/bash hooks/k8s-bootstrap/k8s-bootstrap-ondemand.sh test hooks/hook.env.example
diff --git a/hooks/k8s-bootstrap-ondemand.sh b/hooks/k8s-bootstrap/k8s-bootstrap-ondemand.sh
similarity index 97%
rename from hooks/k8s-bootstrap-ondemand.sh
rename to hooks/k8s-bootstrap/k8s-bootstrap-ondemand.sh
index 093cd0c850..9f4d5490c9 100755
--- a/hooks/k8s-bootstrap-ondemand.sh
+++ b/hooks/k8s-bootstrap/k8s-bootstrap-ondemand.sh
@@ -22,7 +22,7 @@ export PATH=/usr/local/bin:/bin:$PATH
 export NAMESPACE="${NAMESPACE_PREFIX}${ONDEMAND_USERNAME}"
 
 BASEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-YAML_DIR="${BASEDIR}/k8s-bootstrap"
+YAML_DIR="${BASEDIR}/yaml"
 TMPFILE=$(mktemp "/tmp/k8-ondemand-bootstrap-${ONDEMAND_USERNAME}.XXXXXX")
 
 envsubst < "${YAML_DIR}/namespace.yaml" > "$TMPFILE"
diff --git a/hooks/ondemand.yaml b/hooks/k8s-bootstrap/ondemand.yaml
similarity index 100%
rename from hooks/ondemand.yaml
rename to hooks/k8s-bootstrap/ondemand.yaml
diff --git a/hooks/set-k8s-creds.sh b/hooks/k8s-bootstrap/set-k8s-creds.sh
similarity index 100%
rename from hooks/set-k8s-creds.sh
rename to hooks/k8s-bootstrap/set-k8s-creds.sh
diff --git a/hooks/k8s-bootstrap/job-pod-reaper.yaml b/hooks/k8s-bootstrap/yaml/job-pod-reaper.yaml
similarity index 100%
rename from hooks/k8s-bootstrap/job-pod-reaper.yaml
rename to hooks/k8s-bootstrap/yaml/job-pod-reaper.yaml
diff --git a/hooks/k8s-bootstrap/namespace.yaml b/hooks/k8s-bootstrap/yaml/namespace.yaml
similarity index 100%
rename from hooks/k8s-bootstrap/namespace.yaml
rename to hooks/k8s-bootstrap/yaml/namespace.yaml
diff --git a/hooks/k8s-bootstrap/network-policy.yaml b/hooks/k8s-bootstrap/yaml/network-policy.yaml
similarity index 100%
rename from hooks/k8s-bootstrap/network-policy.yaml
rename to hooks/k8s-bootstrap/yaml/network-policy.yaml
diff --git a/hooks/k8s-bootstrap/pod-security-policy.yaml b/hooks/k8s-bootstrap/yaml/pod-security-policy.yaml
similarity index 100%
rename from hooks/k8s-bootstrap/pod-security-policy.yaml
rename to hooks/k8s-bootstrap/yaml/pod-security-policy.yaml
diff --git a/hooks/k8s-bootstrap/rolebinding.yaml b/hooks/k8s-bootstrap/yaml/rolebinding.yaml
similarity index 100%
rename from hooks/k8s-bootstrap/rolebinding.yaml
rename to hooks/k8s-bootstrap/yaml/rolebinding.yaml
diff --git a/lib/tasks/test.rb b/lib/tasks/test.rb
index 41b3aa052e..a3ceb397aa 100644
--- a/lib/tasks/test.rb
+++ b/lib/tasks/test.rb
@@ -48,7 +48,7 @@ def yarn_app?(path)
     sh "shellcheck -x ood-portal-generator/sbin/update_ood_portal"
     sh "shellcheck -x nginx_stage/sbin/nginx_stage"
     sh "shellcheck nginx_stage/sbin/update_nginx_stage"
-    sh "shellcheck hooks/*.sh"
+    sh "shellcheck hooks/k8s-bootstrap/*.sh"
   end
 
   begin