Skip to content

Commit 40bc206

Browse files
committed
fix: migrate token symlinks, fix additional manifest dir creation
1 parent 3ffb541 commit 40bc206

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

jobs/k3s-server/templates/bin/pre-start.erb

+4-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ set -e
1212
if [ -d /var/vcap/store/k3s-server ]; then
1313
# Note: potential remaining leaky open files should not be affected by the mv, according to https://unix.stackexchange.com/a/29227/381792
1414
mv --no-target-directory /var/vcap/store/k3s-server /var/vcap/store/k3s-datadir
15+
#reconfigure symlink
16+
ln -sf /var/vcap/store/k3s-datadir/server/token /var/vcap/store/k3s-datadir/server/node-token
17+
ln -sf /var/vcap/store/k3s-datadir/server/token /var/vcap/store/k3s-datadir/server/agent-token
1518
fi
1619
# persistent dir for k3s datadir
1720
mkdir -p /var/vcap/store/k3s-datadir
@@ -25,7 +28,7 @@ ln -sf /var/vcap/store/k3s-node/etc/rancher /etc/rancher
2528
chmod go-r /var/vcap/jobs/k3s-server/config/datastore-*
2629

2730
# Copy additional manifest file
28-
mkdir -p /var/vcap/store/k3s-datadir/server-manifests
31+
mkdir -p /var/vcap/store/k3s-datadir/server/manifests
2932
cp -f ${JOB_DIR}/config/additional-manifest.yaml /var/vcap/store/k3s-datadir/server/manifests/additional-manifest.yaml
3033

3134
#copy images to containerd expected location (datadir/images) for airgap start.

0 commit comments

Comments
 (0)