Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions phase/reset_controllers.go
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,12 @@ func (p *ResetControllers) Run(ctx context.Context) error {
}
log.Debugf("%s: removing config completed", h)

log.Debugf("%s: removing k0s binary...", h)
if dErr := h.Configurer.DeleteFile(h, h.Configurer.K0sBinaryPath()); dErr != nil {
log.Warnf("%s: failed to remove existing binary %s: %s", h, h.Configurer.K0sConfigPath(), dErr)
}
log.Debugf("%s: removing binary completed", h)

if len(h.Environment) > 0 {
if err := h.Configurer.CleanupServiceEnvironment(h, h.K0sServiceName()); err != nil {
log.Warnf("%s: failed to clean up service environment: %s", h, err.Error())
Expand Down
6 changes: 6 additions & 0 deletions phase/reset_leader.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,12 @@ func (p *ResetLeader) Run(ctx context.Context) error {
}
log.Debugf("%s: removing config completed", p.leader)

log.Debugf("%s: removing k0s binary...", p.leader)
if dErr := p.leader.Configurer.DeleteFile(p.leader, p.leader.Configurer.K0sBinaryPath()); dErr != nil {
log.Warnf("%s: failed to remove existing binary %s: %s", p.leader, p.leader.Configurer.K0sConfigPath(), dErr)
}
log.Debugf("%s: removing binary completed", p.leader)

if len(p.leader.Environment) > 0 {
if err := p.leader.Configurer.CleanupServiceEnvironment(p.leader, p.leader.K0sServiceName()); err != nil {
log.Warnf("%s: failed to clean up service environment: %s", p.leader, err.Error())
Expand Down
6 changes: 6 additions & 0 deletions phase/reset_workers.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,12 @@ func (p *ResetWorkers) Run(ctx context.Context) error {
}
log.Debugf("%s: removing config completed", h)

log.Debugf("%s: removing k0s binary...", h)
if dErr := h.Configurer.DeleteFile(h, h.Configurer.K0sBinaryPath()); dErr != nil {
log.Warnf("%s: failed to remove existing binary %s: %s", h, h.Configurer.K0sConfigPath(), dErr)
}
log.Debugf("%s: removing binary completed", h)

if len(h.Environment) > 0 {
if err := h.Configurer.CleanupServiceEnvironment(h, h.K0sServiceName()); err != nil {
log.Warnf("%s: failed to clean up service environment: %s", h, err.Error())
Expand Down
17 changes: 17 additions & 0 deletions smoke-test/smoke-reset.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,25 @@ trap cleanup EXIT

deleteCluster
createCluster


snapshot() {
bootloose ssh root@manager0 -- \
'find / \( -path /proc -o -path /sys -o -path /dev -o -path /tmp -o -path /run -o -path /var/log -o -path /var/cache \) -prune -o -print 2>/dev/null | sort'
}

echo "* File system snapshot"
snapshot > /tmp/tree_before.txt

echo "* Applying"
../k0sctl apply --config "${K0SCTL_CONFIG}" --debug
echo "* Resetting"
../k0sctl reset --config "${K0SCTL_CONFIG}" --debug --force
echo "* Ensure binary was removed"
bootloose ssh root@manager0 -- '[ ! -f /usr/local/bin/k0s ]'
echo "* Second snapshot"
snapshot > /tmp/tree_after.txt
echo "* File system diff:"
diff -u /tmp/tree_before.txt /tmp/tree_after.txt || true

echo "* Done, cleaning up"
Loading