Re-organize hooks

OSC · Mar 22, 2021 · 6b94c63 · 6b94c63
1 parent 719859b
commit 6b94c63
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 3 deletions.
diff --git 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 → ...s/k8s-bootstrap/k8s-bootstrap-ondemand.sh b/hooks/k8s-bootstrap-ondemand.sh → ...s/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 → hooks/k8s-bootstrap/ondemand.yaml b/hooks/ondemand.yaml → hooks/k8s-bootstrap/ondemand.yaml
diff --git a/hooks/set-k8s-creds.sh → hooks/k8s-bootstrap/set-k8s-creds.sh b/hooks/set-k8s-creds.sh → hooks/k8s-bootstrap/set-k8s-creds.sh
diff --git a/hooks/k8s-bootstrap/job-pod-reaper.yaml → hooks/k8s-bootstrap/yaml/job-pod-reaper.yaml b/hooks/k8s-bootstrap/job-pod-reaper.yaml → hooks/k8s-bootstrap/yaml/job-pod-reaper.yaml
diff --git a/hooks/k8s-bootstrap/namespace.yaml → hooks/k8s-bootstrap/yaml/namespace.yaml b/hooks/k8s-bootstrap/namespace.yaml → hooks/k8s-bootstrap/yaml/namespace.yaml
diff --git a/hooks/k8s-bootstrap/network-policy.yaml → hooks/k8s-bootstrap/yaml/network-policy.yaml b/hooks/k8s-bootstrap/network-policy.yaml → hooks/k8s-bootstrap/yaml/network-policy.yaml
diff --git a/hooks/k8s-bootstrap/pod-security-policy.yaml → ...s-bootstrap/yaml/pod-security-policy.yaml b/hooks/k8s-bootstrap/pod-security-policy.yaml → ...s-bootstrap/yaml/pod-security-policy.yaml
diff --git a/hooks/k8s-bootstrap/rolebinding.yaml → hooks/k8s-bootstrap/yaml/rolebinding.yaml b/hooks/k8s-bootstrap/rolebinding.yaml → hooks/k8s-bootstrap/yaml/rolebinding.yaml
diff --git 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