fix(node-installer): corrects the k3s distribution check #43
Conversation
adamreese
requested review from
Mossaka,
kate-goldenring,
jsturtevant,
radu-matei and
devigned
as code owners
node-installer/Dockerfile
Outdated
| COPY script/installer.sh /script/installer.sh | ||
| COPY ./.tmp/${TARGETPLATFORM} /assets | ||
| COPY ./.tmp /assets |
There was a problem hiding this comment.
Why not copy assets for the target platform?
There was a problem hiding this comment.
When building only a single binary was created and ./.tmp/${TARGETPLATFORM} didn't exist. The binary was ./.tmp/containerd-shiim-spin. There might be a proper fix but I wasn't sure what the expected behavior was.
There was a problem hiding this comment.
Did some investigating. It looks like GH actions doesn't use this Makefile to build the node-installer image. I'll remove this and create a proper fix in another PR.
https://github.com/adamreese/containerd-shim-spin/blob/4e9378e241321506bdfc674cf008c35ab87fd2da/.github/workflows/node-installer.yaml#L50-L55
There was a problem hiding this comment.
I am not well versed in the node installer, but these changes did work for me while the previous didn't probably in part to systemctl not being at /bin/systemctl in my system. @adamreese I wonder for more feedback if it would make sense to PR this into https://github.com/KWasm/kwasm-node-installer/blob/main/script/installer.sh. This was copied here for our CI but i think it will likely pull in changes from the kwasm-node-installer
This commit changes how k3s is detected before restarting containerd. In some cases the `/etc/init.d/k3s` directory won't exist when running k3s. The ordering is also important because containerd can be run in parallel to k3s. Signed-off-by: Adam Reese <[email protected]>
adamreese
force-pushed
the
fix/k3s-node-installer
branch
from
4e9378e to
9f882c0
Compare
This commit changes how k3s is detected before restarting containerd. In some cases the
/etc/init.d/k3sdirectory won't exist when running k3s. The ordering is also important because containerd can be run in parallel to k3s.