fix agent crictl

orange-cloudfoundry · Jan 10, 2022 · 746da5b · 746da5b
1 parent e56142c
commit 746da5b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/jobs/k3s-agent/templates/bin/envrc b/jobs/k3s-agent/templates/bin/envrc
@@ -1,4 +1,6 @@
 #!/bin/bash
 
 export PATH=$PATH:/var/vcap/packages/k3s
-alias crictl="k3s crictl -c /var/vcap//store/k3s-agent/agent/etc/crictl.yaml"
+export PATH=$PATH:/var/vcap/packages/kubectl-k3s
+
+alias crictl="k3s crictl -c /var/vcap/store/k3s-agent/agent/etc/crictl.yaml"
diff --git a/jobs/k3s-agent/templates/bin/pre-start.erb b/jobs/k3s-agent/templates/bin/pre-start.erb
@@ -1,6 +1,11 @@
 #!/bin/sh
+export JOB_DIR=/var/vcap/jobs/k3s-agent
 /var/vcap/packages/k3s/k3s check-config
 
+# Setup ssh env vars
+${JOB_DIR}/bin/setup-user-env
+
+
 #prepare a persistent directory so /etc/rancher/node paswword file is kept on bosh recreate
 mkdir -p /etc
 mkdir -p /var/vcap/store/k3s-node/etc/rancher